[Bf-blender-cvs] [591dc63] master: SCons: Fix compilation error with booleans disabled

Sergey Sharybin noreply at git.blender.org
Wed Oct 15 14:51:44 CEST 2014


Commit: 591dc63eb13150b7cdb1b4ead739c8dd334bb4e3
Author: Sergey Sharybin
Date:   Wed Oct 15 18:51:22 2014 +0600
Branches: master
https://developer.blender.org/rB591dc63eb13150b7cdb1b4ead739c8dd334bb4e3

SCons: Fix compilation error with booleans disabled

===================================================================

M	source/blender/modifiers/SConscript

===================================================================

diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript
index c15a562..b4c8299 100644
--- a/source/blender/modifiers/SConscript
+++ b/source/blender/modifiers/SConscript
@@ -52,6 +52,9 @@ defs = []
 if env['WITH_BF_BOOLEAN']:
     incs.append('#/extern/carve')
     defs.append('WITH_MOD_BOOLEAN')
+else:
+    from os import path
+    sources.remove(path.join('intern', 'MOD_boolean_util.c'))
 
 if env['WITH_BF_REMESH']:
     incs.append('#/intern/dualcon')




More information about the Bf-blender-cvs mailing list