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:
authorDaniel Genrich <daniel.genrich@gmx.net>2010-02-07 17:25:09 +0300
committerDaniel Genrich <daniel.genrich@gmx.net>2010-02-07 17:25:09 +0300
commitdedbf8608e38a165e2667623b2e8075a2a743a77 (patch)
tree7fa3f5ac8ce43828877bb07de464259bf34ee379 /source/blender/blenkernel/SConscript
parent81fd89c8e0f2f4642b00a263e68227cdb8637a3d (diff)
Smoke: Patch #20955 / fix by Damien Plisson (damien78)
* Smoke got it's own thread loop now and can be esc'ed now * Apple OpenMP bug workaround until they fix the GCC (couldn't test this one) * removing some "static" keyword to prevent crashing on frame display * should also fix problems with wavelet.noise crashing (Bug #20710) Fluid: * sleep delay has been reduced to be more responsive * Fluid progress is displayed in percent using the mouse cursor (like smoke)
Diffstat (limited to 'source/blender/blenkernel/SConscript')
-rw-r--r--source/blender/blenkernel/SConscript4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 508ed58165f..37a63be6389 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -55,6 +55,10 @@ if env['WITH_BF_QUICKTIME']:
if env['WITH_BF_BULLET']:
defs.append('USE_BULLET')
+if env['OURPLATFORM'] == 'darwin':
+ if env['WITH_BF_OPENMP']:
+ defs.append('PARALLEL=1')
+
if env['BF_NO_ELBEEM']:
defs.append('DISABLE_ELBEEM')