forked from bartvdbraak/blender
Merge remote-tracking branch 'origin/master' into blender2.8
This commit is contained in:
commit
c90d348e04
@ -3,10 +3,10 @@ if "%GIT%" == "" (
|
|||||||
goto EOF
|
goto EOF
|
||||||
)
|
)
|
||||||
cd "%BLENDER_DIR%"
|
cd "%BLENDER_DIR%"
|
||||||
for /f "delims=" %%i in ('%GIT% rev-parse HEAD') do echo Branch_hash=%%i
|
for /f "delims=" %%i in ('"%GIT%" rev-parse HEAD') do echo Branch_hash=%%i
|
||||||
cd "%BLENDER_DIR%/release/datafiles/locale"
|
cd "%BLENDER_DIR%/release/datafiles/locale"
|
||||||
for /f "delims=" %%i in ('%GIT% rev-parse HEAD') do echo Locale_hash=%%i
|
for /f "delims=" %%i in ('"%GIT%" rev-parse HEAD') do echo Locale_hash=%%i
|
||||||
cd "%BLENDER_DIR%/release/scripts/addons"
|
cd "%BLENDER_DIR%/release/scripts/addons"
|
||||||
for /f "delims=" %%i in ('%GIT% rev-parse HEAD') do echo Addons_Hash=%%i
|
for /f "delims=" %%i in ('"%GIT%" rev-parse HEAD') do echo Addons_Hash=%%i
|
||||||
cd "%BLENDER_DIR%"
|
cd "%BLENDER_DIR%"
|
||||||
:EOF
|
:EOF
|
5
make.bat
5
make.bat
@ -16,6 +16,11 @@ if errorlevel 1 goto EOF
|
|||||||
call "%BLENDER_DIR%\build_files\windows\find_dependencies.cmd"
|
call "%BLENDER_DIR%\build_files\windows\find_dependencies.cmd"
|
||||||
if errorlevel 1 goto EOF
|
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" (
|
if "%SHOW_HELP%" == "1" (
|
||||||
call "%BLENDER_DIR%\build_files\windows\show_help.cmd"
|
call "%BLENDER_DIR%\build_files\windows\show_help.cmd"
|
||||||
goto EOF
|
goto EOF
|
||||||
|
Loading…
Reference in New Issue
Block a user