diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-12-12 18:17:57 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-12-12 18:17:57 +0300 |
commit | 9be6d5ff18fd593e853647d9eec8b3fb074acd7c (patch) | |
tree | 485fb9203c310b5119a549e698db241012ed39ff /source/creator | |
parent | 54528079e3cfaf74eaa119615386564820b45276 (diff) | |
parent | 5f852a4324212221500d11b2c7594f5e0ca894c6 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenloader/intern/versioning_270.c
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_particle.c
Diffstat (limited to 'source/creator')
-rw-r--r-- | source/creator/CMakeLists.txt | 16 | ||||
-rw-r--r-- | source/creator/creator_args.c | 21 |
2 files changed, 23 insertions, 14 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 04a79f6498f..eea45545949 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -713,10 +713,7 @@ elseif(WIN32) ) if(WITH_PYTHON_INSTALL_NUMPY) - set(PYTHON_NUMPY_VERSION 1.9) - if((MSVC_VERSION EQUAL 1900) OR (MSVC_VERSION EQUAL 1910)) - set(PYTHON_NUMPY_VERSION 1.11) - endif() + set(PYTHON_NUMPY_VERSION 1.10) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages) @@ -830,11 +827,12 @@ elseif(WIN32) else() install( FILES - ${LIBDIR}/ffmpeg/lib/avcodec-55.dll - ${LIBDIR}/ffmpeg/lib/avformat-55.dll - ${LIBDIR}/ffmpeg/lib/avdevice-55.dll - ${LIBDIR}/ffmpeg/lib/avutil-52.dll - ${LIBDIR}/ffmpeg/lib/swscale-2.dll + ${LIBDIR}/ffmpeg/lib/avcodec-57.dll + ${LIBDIR}/ffmpeg/lib/avformat-57.dll + ${LIBDIR}/ffmpeg/lib/avdevice-57.dll + ${LIBDIR}/ffmpeg/lib/avutil-55.dll + ${LIBDIR}/ffmpeg/lib/swscale-4.dll + ${LIBDIR}/ffmpeg/lib/swresample-2.dll DESTINATION "." ) endif() diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index 21586d162e5..4d05c3f41fb 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -554,6 +554,7 @@ static int arg_handle_print_help(int UNUSED(argc), const char **UNUSED(argv), vo BLI_argsPrintArgDoc(ba, "--debug-gpumem"); BLI_argsPrintArgDoc(ba, "--debug-wm"); BLI_argsPrintArgDoc(ba, "--debug-all"); + BLI_argsPrintArgDoc(ba, "--debug-io"); printf("\n"); BLI_argsPrintArgDoc(ba, "--debug-fpe"); @@ -585,15 +586,15 @@ static int arg_handle_print_help(int UNUSED(argc), const char **UNUSED(argv), vo BLI_argsPrintArgDoc(ba, "--"); printf("\n"); - printf("Other Options:\n"); - BLI_argsPrintOtherDoc(ba); - - /* keep last args */ - printf("\n"); printf("Experimental Features:\n"); BLI_argsPrintArgDoc(ba, "--enable-new-depsgraph"); BLI_argsPrintArgDoc(ba, "--enable-new-basic-shader-glsl"); + /* Other options _must_ be last (anything not handled will show here) */ + printf("\n"); + printf("Other Options:\n"); + BLI_argsPrintOtherDoc(ba); + printf("\n"); printf("Argument Parsing:\n"); printf("\tArguments must be separated by white space, eg:\n"); @@ -756,6 +757,14 @@ static int arg_handle_debug_mode_generic_set(int UNUSED(argc), const char **UNUS return 0; } +static const char arg_handle_debug_mode_io_doc[] = +"\n\tEnable debug messages for I/O (collada, ...)"; +static int arg_handle_debug_mode_io(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) +{ + G.debug |= G_DEBUG_IO; + return 0; +} + static const char arg_handle_debug_mode_all_doc[] = "\n\tEnable all debug messages"; static int arg_handle_debug_mode_all(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) @@ -1805,6 +1814,8 @@ void main_args_setup(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle) CB_EX(arg_handle_debug_mode_generic_set, wm), (void *)G_DEBUG_WM); BLI_argsAdd(ba, 1, NULL, "--debug-all", CB(arg_handle_debug_mode_all), NULL); + BLI_argsAdd(ba, 1, NULL, "--debug-io", CB(arg_handle_debug_mode_io), NULL); + BLI_argsAdd(ba, 1, NULL, "--debug-fpe", CB(arg_handle_debug_fpe_set), NULL); |