[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47113] trunk/blender/source/blender/ blenkernel/intern/smoke.c: Smoke: Fix messed up shadow display with OpenMP.

Daniel Genrich daniel.genrich at gmx.net
Mon May 28 16:31:08 CEST 2012


Revision: 47113
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47113
Author:   genscher
Date:     2012-05-28 14:31:08 +0000 (Mon, 28 May 2012)
Log Message:
-----------
Smoke: Fix messed up shadow display with OpenMP. This needs fixing. For now disable openmp for that function. Shadow calculation would be better raytraced on GPU or using shaders for the future.

Part of my Blender Smoke Development Phase III.

(accidently commited this to smoke2 branch first)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/smoke.c

Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c	2012-05-28 14:29:20 UTC (rev 47112)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c	2012-05-28 14:31:08 UTC (rev 47113)
@@ -1868,7 +1868,7 @@
 	
 	if(result[index] < 0.0f)	
 	{
-#pragma omp critical		
+// #pragma omp critical		
 		result[index] = *tRay;	
 	}	
 
@@ -2012,7 +2012,7 @@
 	bv[4] = p0[2];
 	bv[5] = p1[2];
 
-#pragma omp parallel for schedule(static,1)
+// #pragma omp parallel for schedule(static,1)
 	for(z = 0; z < res[2]; z++)
 	{
 		size_t index = z*slabsize;




More information about the Bf-blender-cvs mailing list