Fix T58006: smart UV project island margin should not use length units.
[blender.git] / make.bat
index fc5450c873d04d3e2cd1e5936ccd318319fe6442..5fb428fbed034709df994aada23e7abd61855c3a 100644 (file)
--- a/make.bat
+++ b/make.bat
@@ -16,6 +16,11 @@ if errorlevel 1 goto EOF
 call "%BLENDER_DIR%\build_files\windows\find_dependencies.cmd"
 if errorlevel 1 goto EOF
 
+if "%BUILD_SHOW_HASHES%" == "1" (
+       call "%BLENDER_DIR%\build_files\windows\show_hashes.cmd"
+       goto EOF
+)
+
 if "%SHOW_HELP%" == "1" (
        call "%BLENDER_DIR%\build_files\windows\show_help.cmd"
        goto EOF
@@ -26,7 +31,7 @@ if "%BUILD_UPDATE%" == "1" (
        goto EOF
 )
 
-call "%BLENDER_DIR%\build_files\windows\detect_architecture.cmd" 
+call "%BLENDER_DIR%\build_files\windows\detect_architecture.cmd"
 
 if "%BUILD_VS_YEAR%" == "" (
        call "%BLENDER_DIR%\build_files\windows\autodetect_msvc.cmd"
@@ -42,21 +47,28 @@ if "%BUILD_VS_YEAR%" == "" (
        )
 )
 
-call "%BLENDER_DIR%\build_files\windows\set_build_dir.cmd" 
+call "%BLENDER_DIR%\build_files\windows\set_build_dir.cmd"
 
 echo Building blender with VS%BUILD_VS_YEAR% for %BUILD_ARCH% in %BUILD_DIR%
 
-call "%BLENDER_DIR%\build_files\windows\check_libraries.cmd" 
+call "%BLENDER_DIR%\build_files\windows\check_libraries.cmd"
 if errorlevel 1 goto EOF
 
-call "%BLENDER_DIR%\build_files\windows\check_submodules.cmd" 
+call "%BLENDER_DIR%\build_files\windows\check_submodules.cmd"
 if errorlevel 1 goto EOF
 
-call "%BLENDER_DIR%\build_files\windows\configure_msbuild.cmd" 
-if errorlevel 1 goto EOF
+if "%BUILD_WITH_NINJA%" == "" (
+       call "%BLENDER_DIR%\build_files\windows\configure_msbuild.cmd"
+       if errorlevel 1 goto EOF
 
-call "%BLENDER_DIR%\build_files\windows\build_msbuild.cmd" 
-if errorlevel 1 goto EOF
+       call "%BLENDER_DIR%\build_files\windows\build_msbuild.cmd"
+       if errorlevel 1 goto EOF
+) else (
+       call "%BLENDER_DIR%\build_files\windows\configure_ninja.cmd"
+       if errorlevel 1 goto EOF
+
+       call "%BLENDER_DIR%\build_files\windows\build_ninja.cmd"
+       if errorlevel 1 goto EOF
+)
 
 :EOF
-echo make2 done