diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-10 17:36:27 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-10 17:36:27 +0400 |
| commit | 353713afe827610501f0123b44b0054f49bf56ed (patch) | |
| tree | de966b9d426b06708e37ad647a145e0940e4f535 /source/blender/python/SConscript | |
| parent | fce87339750d50303f8b0324d88b517a10b76d52 (diff) | |
| parent | 322dbc9a0fa7d0e1c82fa2968728cbfc5c536445 (diff) | |
Merged changes in the trunk up to revision 40096.
Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt
Note for branch builders: Enabling Blender Player may cause linker errors.
Diffstat (limited to 'source/blender/python/SConscript')
| -rw-r--r-- | source/blender/python/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index bacd7550aef..07f987f4751 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -5,7 +5,7 @@ Import ('env') incs = '. ../editors/include ../makesdna ../makesrna ../blenlib ../blenkernel ../nodes' -incs += ' ../imbuf ../blenloader ../render/extern/include ../windowmanager' +incs += ' ../imbuf ../blenloader ../gpu ../render/extern/include ../windowmanager' incs += ' ../freestyle/intern/python' incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include' incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC'] |