diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-06-11 00:50:43 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-06-11 00:50:43 +0400 |
| commit | 8135cc9f954e0d63ab3e97d4a7c52ff5e573eef0 (patch) | |
| tree | a12ec0daccfc45b7e3c68e4a2d7099655daf619d /source/blender/makesrna/SConscript | |
| parent | 0f33d5719fd0adc666e7e92e0f062281f4285f13 (diff) | |
| parent | 298feff39006c14aa28b5e0232aa7ed70a83a496 (diff) | |
Merged changes in the trunk up to revision 47700.
Conflicts resolved:
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/windowmanager/WM_types.h
Diffstat (limited to 'source/blender/makesrna/SConscript')
| -rw-r--r-- | source/blender/makesrna/SConscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index 371a0e32155..5379de52ca8 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -11,13 +11,16 @@ incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin ../ble incs += ' ../render/extern/include #/intern/cycles/blender' incs += ' ../nodes' incs += ' #/extern/glew/include' +incs += ' #/intern/smoke/extern' incs += ' ../freestyle' incs += ' ../bmesh' - defs = [] +if env['WITH_BF_SMOKE']: + defs.append('WITH_SMOKE') + if env['WITH_BF_OPENEXR']: defs.append('WITH_OPENEXR') |