From 0a7853478f74814a02254a18f4830089716dc07a Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 16 Dec 2010 14:49:50 +0000 Subject: [PATCH] Workaround #22856: defocus node with OpenMP could crash on Mac, just disabled OpenMP now in that case, since it's only an optimization. --- source/blender/nodes/intern/CMP_nodes/CMP_defocus.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c b/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c index a18ae13b438..d3fd7c8bcad 100644 --- a/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c +++ b/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c @@ -378,10 +378,12 @@ static void defocus_blur(bNode *node, CompBuf *new, CompBuf *img, CompBuf *zbuf, //------------------------------------------------------------------ // main loop +#ifndef __APPLE__ /* can crash on Mac, see bug #22856, disabled for now */ #ifdef __INTEL_COMPILER /* icc doesn't like the compound statement -- internal error: 0_1506 */ #pragma omp parallel for private(y) if(!nqd->preview) schedule(guided) #else #pragma omp parallel for private(y) if(!nqd->preview && img->y*img->x > 16384) schedule(guided) +#endif #endif for (y=0; yy; y++) { unsigned int p, p4, zp, cp, cp4;