diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-07 10:58:27 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-07 10:59:26 +0300 |
commit | 24d29f2e500771257cc962e899630edaccb01cfe (patch) | |
tree | 600780f0dab7f3efe5477eb24d59c533bc2abdc6 /source/creator | |
parent | 11af9e9a5bd1caff1ec46794bda2934a01ce5035 (diff) | |
parent | 3054e33d67c8f524dae915c8f1f016a7bfa63ab0 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/particle.c
source/blender/editors/transform/transform_snap_object.c
Diffstat (limited to 'source/creator')
-rw-r--r-- | source/creator/CMakeLists.txt | 8 | ||||
-rw-r--r-- | source/creator/creator_args.c | 18 |
2 files changed, 16 insertions, 10 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index e3cbfbf838b..122c10ef216 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -692,6 +692,10 @@ elseif(WIN32) ) if(WITH_PYTHON_INSTALL_NUMPY) + set(PYTHON_NUMPY_VERSION 1.9) + if(MSVC_VERSION EQUAL 1900) + set(PYTHON_NUMPY_VERSION 1.11) + endif() 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) @@ -699,9 +703,9 @@ elseif(WIN32) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages/numpy COMMAND ${CMAKE_COMMAND} -E - tar xzvf "${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_1.9.tar.gz" + tar xzvf "${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_${PYTHON_NUMPY_VERSION}.tar.gz" DEPENDS - ${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_1.9.tar.gz + ${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_numpy_${PYTHON_NUMPY_VERSION}.tar.gz ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${BLENDER_VERSION}/python/lib/site-packages ) diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index 69765fc2341..3b27ad6f693 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -583,9 +583,16 @@ 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"); + + printf("\n"); printf("Argument Parsing:\n"); printf("\tArguments must be separated by white space, eg:\n"); printf("\t# blender -ba test.blend\n"); @@ -619,11 +626,6 @@ static int arg_handle_print_help(int UNUSED(argc), const char **UNUSED(argv), vo #endif printf(" $PYTHONHOME Path to the python directory, eg. /usr/lib/python.\n\n"); - /* keep last */ - printf("\n"); - printf("Experimental Features:\n"); - BLI_argsPrintArgDoc(ba, "--enable-new-depsgraph"); - exit(0); return 0; @@ -862,7 +864,7 @@ static const char arg_handle_playback_mode_doc[] = "<options> <file(s)>\n" "\tPlayback <file(s)>, only operates this way when not running in background.\n" "\t\t-p <sx> <sy>\tOpen with lower left corner at <sx>, <sy>\n" -"\t\t-m\t\tRead from disk (Don't buffer)\n" +"\t\t-m\t\tRead from disk (Do not buffer)\n" "\t\t-f <fps> <fps-base>\t\tSpecify FPS to start with\n" "\t\t-j <frame>\tSet frame step to <frame>\n" "\t\t-s <frame>\tPlay from <frame>\n" @@ -950,10 +952,10 @@ static int arg_handle_start_with_console(int UNUSED(argc), const char **UNUSED(a } static const char arg_handle_register_extension_doc[] = -"\n\tRegister .blend extension, then exit (Windows only)" +"\n\tRegister blend-file extension, then exit (Windows only)" ; static const char arg_handle_register_extension_doc_silent[] = -"\n\tSilently register .blend extension, then exit (Windows only)" +"\n\tSilently register blend-file extension, then exit (Windows only)" ; static int arg_handle_register_extension(int UNUSED(argc), const char **UNUSED(argv), void *data) { |