diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-01-03 11:33:11 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-03 11:33:11 +0400 |
commit | 46f2233a9355ba09aaa9195c4da32a015f02fb8d (patch) | |
tree | 64769fdf96c089feb16d10948e8d07617c97d48a /source/blender/modifiers | |
parent | c0eec8f379bb0c265e7bf2ad74397c22836bae3c (diff) | |
parent | 434c1e6df82a082fe03034a3ad3825f7b50ea533 (diff) |
svn merge ^/trunk/blender -r43085:43092
Diffstat (limited to 'source/blender/modifiers')
-rw-r--r-- | source/blender/modifiers/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index bfd96c5868f..4ab3874d6fe 100644 --- a/source/blender/modifiers/SConscript +++ b/source/blender/modifiers/SConscript @@ -14,10 +14,10 @@ incs += ' ' + env['BF_ZLIB_INC'] defs = [] if env ['WITH_BF_BOOLEAN']: - incs += ' #/intern/dualcon' defs.append('WITH_MOD_BOOLEAN') if env['WITH_BF_REMESH']: + incs += ' #/intern/dualcon' defs.append('WITH_MOD_REMESH') if env ['WITH_BF_DECIMATE']: |