diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
| commit | 9282d305bdc56522543129436db1e8a5d19cf39f (patch) | |
| tree | b6d0cdcc7dd3f4113cf9e4f9813c40f44d29746e /source/blender/modifiers/SConscript | |
| parent | de724a258eda45d1fed2b2176006c3b2df8abea2 (diff) | |
| parent | 646a96bf8edc211a06f3df652101c265ee166e8d (diff) | |
Merge branch 'master' into texture_nodes_refactortexture_nodes_refactor
Conflicts:
source/blender/nodes/texture/nodes/node_texture_math.c
Diffstat (limited to 'source/blender/modifiers/SConscript')
| -rw-r--r-- | source/blender/modifiers/SConscript | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index c15a562abc0..b4c8299250e 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') |