diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-04-15 14:28:32 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-04-15 14:28:32 +0400 |
| commit | 9a85013692322f8a821b8228ad552f84d2a215e9 (patch) | |
| tree | 666bb54fa093429d65b6b0322e8058c03f5fe223 /source/blender/modifiers/SConscript | |
| parent | 2b018673509fe7a38a6332fae00bd605335bd286 (diff) | |
Merge various small changes from render branch:
* Division by zero fix for TNT SVD code.
* Sound fix, in case ffmpeg decode fails, don't use the samples.
* Fix for incorrect bounds of transformed objects in new raytracing code.
* Gave memory arena's a name used for allocations for easier memory
usage debugging.
* Dupligroup no_draw option was using layers but not restrict view/render
setting. (not a bugfix exactly but would do display list context switching
while drawing for no reason).
* Fix objects instanced on hair particles not giving consistent results
when the object is transformed.
* New math functions: madd_v4_v4fl, len_squared_v3v3, interp_v4_v4v4v4,
mul_v4_m4v4, SH and form factor functions, box_minmax_bounds_m4.
* mul_m4_m4m4 and mul_m3_m3m3 now accept the same pointers for multiple
arguments.
* endjob callback for WM jobs system.
* Geometry node uv/color layer now has search list/autocomplete.
* Various small buildsystem tweaks, not strictly needed yet in trunk.
Diffstat (limited to 'source/blender/modifiers/SConscript')
| -rw-r--r-- | source/blender/modifiers/SConscript | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index ad7f80f0907..dc1598fa6e9 100644 --- a/source/blender/modifiers/SConscript +++ b/source/blender/modifiers/SConscript @@ -10,8 +10,11 @@ incs += ' ../include ../blenlib ../makesdna ../blenkernel ../blenkernel/intern' incs += ' ' + env['BF_ZLIB_INC'] -defs = '' +defs = [] + +if env['BF_NO_ELBEEM']: + defs.append('DISABLE_ELBEEM') env.BlenderLib ( libname = 'modifiers', sources = sources, - includes = Split(incs), defines = Split(defs), - libtype=['core','player'], priority = [180, 20] )
\ No newline at end of file + includes = Split(incs), defines=defs, + libtype=['core','player'], priority = [180, 20] ) |