diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-12-16 17:49:50 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-12-16 17:49:50 +0300 |
| commit | 0a7853478f74814a02254a18f4830089716dc07a (patch) | |
| tree | a8ede079748155d76a3e000558f25d1e1560237e /source/blender/nodes/intern/CMP_nodes | |
| parent | 919d3413216818ef794dc897831d39059ac73f16 (diff) | |
Workaround #22856: defocus node with OpenMP could crash on Mac, just disabled
OpenMP now in that case, since it's only an optimization.
Diffstat (limited to 'source/blender/nodes/intern/CMP_nodes')
| -rw-r--r-- | source/blender/nodes/intern/CMP_nodes/CMP_defocus.c | 2 |
1 files changed, 2 insertions, 0 deletions
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,11 +378,13 @@ 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; y<img->y; y++) { unsigned int p, p4, zp, cp, cp4; float *ctcol, u, v, ct_crad, cR2=0; |