[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55939] trunk/blender/intern/elbeem/intern /simulation_object.cpp: The fluid threads setting is still WIP, for now fix compiling without openMP enabled

jens verwiebe info at jensverwiebe.de
Wed Apr 10 22:05:11 CEST 2013


Revision: 55939
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55939
Author:   jensverwiebe
Date:     2013-04-10 20:05:11 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
The fluid threads setting is still WIP, for now fix compiling without openMP enabled

Modified Paths:
--------------
    trunk/blender/intern/elbeem/intern/simulation_object.cpp

Modified: trunk/blender/intern/elbeem/intern/simulation_object.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/simulation_object.cpp	2013-04-10 18:35:18 UTC (rev 55938)
+++ trunk/blender/intern/elbeem/intern/simulation_object.cpp	2013-04-10 20:05:11 UTC (rev 55939)
@@ -177,7 +177,9 @@
 		mpLbm->initDomainTrafo( mpElbeemSettings->surfaceTrafo );
 		mpLbm->setSmoothing(1.0 * mpElbeemSettings->surfaceSmoothing, 1.0 * mpElbeemSettings->surfaceSmoothing);
 		mpLbm->setIsoSubdivs(mpElbeemSettings->surfaceSubdivs);
+#if PARALLEL==1
 		omp_set_num_threads(mpElbeemSettings->threads);
+#endif
 		mpLbm->setSizeX(mpElbeemSettings->resolutionxyz);
 		mpLbm->setSizeY(mpElbeemSettings->resolutionxyz);
 		mpLbm->setSizeZ(mpElbeemSettings->resolutionxyz);




More information about the Bf-blender-cvs mailing list