Merge remote-tracking branch 'origin/master' into blender2.8
authorRay Molenkamp <github@lazydodo.com>
Sat, 16 Jun 2018 18:30:56 +0000 (12:30 -0600)
committerRay Molenkamp <github@lazydodo.com>
Sat, 16 Jun 2018 18:30:56 +0000 (12:30 -0600)
1  2 
make.bat

diff --combined make.bat
+++ b/make.bat
@@@ -16,6 -16,11 +16,11 @@@ if errorlevel 1 goto EO
  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
@@@ -66,4 -71,4 +71,4 @@@ if "%BUILD_WITH_NINJA%" == "" 
        if errorlevel 1 goto EOF
  )
  
 -:EOF
 +:EOF