[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33712] trunk/blender/source/blender/nodes /intern/CMP_nodes/CMP_defocus.c: Workaround #22856: defocus node with OpenMP could crash on Mac, just disabled

[Brecht Van Lommel]

Revision: 33712
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33712
Author:   blendix
Date:     2010-12-16 15:49:50 +0100 (Thu, 16 Dec 2010)

Log Message:
-----------
Workaround #22856: defocus node with OpenMP could crash on Mac, just disabled
OpenMP now in that case, since it's only an optimization.

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c

Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c	2010-12-16 13:43:20 UTC (rev 33711)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c	2010-12-16 14:49:50 UTC (rev 33712)
@@ -378,11 +378,13 @@
 
 	//------------------------------------------------------------------
 	// 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;