projects
/
blender-staging.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
svn merge -r 12937:13095 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git]
/
SConstruct
diff --git
a/SConstruct
b/SConstruct
index 7fad247ec07cde6300ac05a072ea224a2177d323..adecfcb5dcf15056e285a3c8ac6c448de519359c 100644
(file)
--- a/
SConstruct
+++ b/
SConstruct
@@
-170,6
+170,9
@@
else:
opts = btools.read_opts(optfiles, B.arguments)
opts.Update(env)
+if not env['BF_FANCY']:
+ B.bc.disable()
+
# disable elbeem (fluidsim) compilation?
if env['BF_NO_ELBEEM'] == 1:
env['CPPFLAGS'].append('-DDISABLE_ELBEEM')