diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-17 17:28:40 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-17 17:28:40 +0400 |
| commit | f4a9215d7c80da4d39bd195c334fcb26676b12d5 (patch) | |
| tree | bab7f751952eee6cfc19e7a674133cda8b247062 /source/creator | |
| parent | 66b1dfae89cc44953bd51c5da962cab437e76972 (diff) | |
| parent | d87fcb0760202516b26a78858e3a1e81650c1598 (diff) | |
Cycles: svn merge -r39870:r40266 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Merging the node changes required a lot of conflict resolution, fixed the
issues I could find but if you want stability you might want to wait a bit
before updating.
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | source/creator/creator.c | 21 |
2 files changed, 21 insertions, 21 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 8afd7e2f3c4..61d01050ba5 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -435,12 +435,12 @@ elseif(WIN32) PATTERN ".svn" EXCLUDE ) - if(NOT CMAKE_CL_64) - install( - FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll - DESTINATION ${TARGETDIR} - ) + install( + FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll + DESTINATION ${TARGETDIR} + ) + if(NOT CMAKE_CL_64) install( FILES ${LIBDIR}/iconv/lib/iconv.dll DESTINATION ${TARGETDIR} @@ -723,7 +723,11 @@ add_dependencies(blender makesdna) get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS) -set(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_render) +set(BLENDER_LINK_LIBS + ${BLENDER_LINK_LIBS} + bf_windowmanager + bf_render +) if(WITH_MOD_FLUID) list(APPEND BLENDER_LINK_LIBS bf_intern_elbeem) @@ -819,6 +823,7 @@ endif() extern_minilzo extern_lzma ge_logic_ketsji + extern_recastnavigation ge_phys_common ge_logic ge_rasterizer @@ -826,7 +831,6 @@ endif() ge_logic_expressions ge_scenegraph ge_logic_network - bf_python # duplicate for BPY_driver_exec ge_logic_ngnetwork extern_bullet ge_logic_loopbacknetwork @@ -839,7 +843,8 @@ endif() bf_blenfont bf_intern_audaspace bf_intern_mikktspace - + extern_recastnavigation + bf_editor_util # --- BAD LEVEL CALL HERE --- XXX, this should be removed before release! bf_intern_cycles cycles_render cycles_bvh diff --git a/source/creator/creator.c b/source/creator/creator.c index 2e72aefa99f..abb993e4cb1 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -543,22 +543,17 @@ static int set_output(int argc, const char **argv, void *data) static int set_engine(int argc, const char **argv, void *data) { bContext *C = data; - if (argc >= 1) - { - if (!strcmp(argv[1],"help")) - { + if (argc >= 2) { + if (!strcmp(argv[1], "help")) { RenderEngineType *type = NULL; - - for( type = R_engines.first; type; type = type->next ) - { + printf("Blender Engine Listing:\n"); + for( type = R_engines.first; type; type = type->next ) { printf("\t%s\n", type->idname); } exit(0); } - else - { - if (CTX_data_scene(C)==NULL) - { + else { + if (CTX_data_scene(C)==NULL) { printf("\nError: no blend loaded. order the arguments so '-E / --engine ' is after a blend is loaded.\n"); } else { @@ -566,7 +561,7 @@ static int set_engine(int argc, const char **argv, void *data) RenderData *rd = &scene->r; if(BLI_findstring(&R_engines, argv[1], offsetof(RenderEngineType, idname))) { - BLI_strncpy(rd->engine, argv[1], sizeof(rd->engine)); + BLI_strncpy_utf8(rd->engine, argv[1], sizeof(rd->engine)); } } } @@ -575,7 +570,7 @@ static int set_engine(int argc, const char **argv, void *data) } else { - printf("\nEngine not specified.\n"); + printf("\nEngine not specified, give 'help' for a list of available engines.\n"); return 0; } } |