diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-06 02:24:05 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-06 02:24:05 +0400 |
| commit | feccbaabbd39c18b2f552964ebd8dfab4eeaed89 (patch) | |
| tree | 0069f654883a7a02dd320649ce61bd7933748111 /source/creator | |
| parent | a22096e8019c461128a0907e4026859996ec1b5c (diff) | |
| parent | 37ba969c74840142682cf22f34610f3b65b86cf4 (diff) | |
Merged changes in the trunk up to revision 53584.
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/RNA_enum_types.h
Also made additional code updates for:
r53355 UIList - Python-extendable list of UI items
r53460 Alpha premul pipeline cleanup
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | source/creator/creator.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index e0a38096904..7db4b5bfc89 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -793,8 +793,7 @@ add_dependencies(blender makesdna) get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS) -set(BLENDER_LINK_LIBS - ${BLENDER_LINK_LIBS} +list(APPEND BLENDER_LINK_LIBS bf_windowmanager bf_render ) @@ -908,7 +907,6 @@ endif() ge_scenegraph ge_logic_network ge_logic_ngnetwork - extern_bullet ge_logic_loopbacknetwork bf_intern_moto extern_openjpeg @@ -929,6 +927,7 @@ endif() cycles_subd bf_intern_raskter bf_intern_opencolorio + extern_rangetree ) if(WITH_COMPOSITOR) @@ -986,6 +985,10 @@ endif() list(APPEND BLENDER_SORTED_LIBS bf_intern_locale) endif() + if(WITH_BULLET AND NOT WITH_BULLET_SYSTEM) + list_insert_after(BLENDER_SORTED_LIBS "ge_logic_ngnetwork" "extern_bullet") + endif() + foreach(SORTLIB ${BLENDER_SORTED_LIBS}) set(REMLIB ${SORTLIB}) foreach(SEARCHLIB ${BLENDER_LINK_LIBS}) diff --git a/source/creator/creator.c b/source/creator/creator.c index 706ced245bb..d678df33ad0 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -1420,7 +1420,7 @@ int main(int argc, const char **argv) WM_main(C); return 0; -} /* end of int main(argc,argv) */ +} /* end of int main(argc, argv) */ #ifdef WITH_PYTHON_MODULE void main_python_exit(void) |