Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Plisson <damien.plisson@yahoo.fr>2009-12-08 12:58:42 +0300
committerDamien Plisson <damien.plisson@yahoo.fr>2009-12-08 12:58:42 +0300
commit5132b6a173fd88ead0bd7f0dd82bacf8672b3b4a (patch)
treeffea70b0e6f6adeb768315b206e342687ef4c83d /intern/elbeem/SConscript
parentfccceaa87fb1e883c5d29113dc8b7d33786c8c1e (diff)
OSX: Disable parallel openMP for elbeem library until a proper fix is found (currently makes fluid sim crash) (Bug# 20043)
Thx Jens Verwiebe for the investigation!
Diffstat (limited to 'intern/elbeem/SConscript')
-rw-r--r--intern/elbeem/SConscript3
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/elbeem/SConscript b/intern/elbeem/SConscript
index 0900ab1db5c..ef411d0eb03 100644
--- a/intern/elbeem/SConscript
+++ b/intern/elbeem/SConscript
@@ -8,7 +8,8 @@ sources = env.Glob('intern/*.cpp')
defs = 'NOGUI ELBEEM_BLENDER=1'
if env['WITH_BF_OPENMP']:
- defs += ' PARALLEL'
+ if env['OURPLATFORM'] != 'darwin':
+ defs += ' PARALLEL'
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
defs += ' USE_MSVC6FIXES'