Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merged changes in the trunk up to revision 34193.

Browse Source 
Conflicts resolved:
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_channels.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c

API changes resolved:
source/blender/freestyle/intern/system/PythonInterpreter.h
This commit is contained in:
Tamito Kajiyama
2011-01-09 15:07:14 +00:00
parent ddcb91fc21 99e203dbd4
commit 0ec378f3fe
591 changed files with 9099 additions and 5273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/creator/CMakeLists.txt
View File

@@ -558,7 +558,7 @@ endif()
ge_scenegraph
ge_logic_network
bf_gen_system
bf_python # duplicate for BPY_eval_driver
bf_python # duplicate for BPY_driver_exec
ge_logic_ngnetwork
extern_bullet
ge_logic_loopbacknetwork