sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Workaround #22856: defocus node with OpenMP could crash on Mac, just disabled

Browse Source 
OpenMP now in that case, since it's only an optimization.
This commit is contained in:
Brecht Van Lommel 2010-12-16 14:49:50 +00:00
parent 919d341321
commit 0a7853478f
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
View File

@ -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; y<img->y; y++) {
unsigned int p, p4, zp, cp, cp4;