Merge branch 'blender-v3.5-release' into main
This commit is contained in:
commit
025beb2cda
|
@ -1,20 +0,0 @@
|
||||||
if NOT exist "%BLENDER_DIR%\source\tools\.git" (
|
|
||||||
echo Checking out sub-modules
|
|
||||||
if not "%GIT%" == "" (
|
|
||||||
"%GIT%" submodule update --init --recursive --progress
|
|
||||||
if errorlevel 1 goto FAIL
|
|
||||||
"%GIT%" submodule foreach git checkout main
|
|
||||||
if errorlevel 1 goto FAIL
|
|
||||||
"%GIT%" submodule foreach git pull --rebase origin main
|
|
||||||
if errorlevel 1 goto FAIL
|
|
||||||
goto EOF
|
|
||||||
) else (
|
|
||||||
echo Blender submodules not found, and git not found in path to retrieve them.
|
|
||||||
goto FAIL
|
|
||||||
)
|
|
||||||
)
|
|
||||||
goto EOF
|
|
||||||
|
|
||||||
:FAIL
|
|
||||||
exit /b 1
|
|
||||||
:EOF
|
|
|
@ -14,7 +14,7 @@ if NOT EXIST %PYTHON% (
|
||||||
exit /b 1
|
exit /b 1
|
||||||
)
|
)
|
||||||
|
|
||||||
set FORMAT_PATHS=%BLENDER_DIR%\source\tools\utils_maintenance\clang_format_paths.py
|
set FORMAT_PATHS=%BLENDER_DIR%\tools\utils_maintenance\clang_format_paths.py
|
||||||
|
|
||||||
REM The formatting script expects clang-format to be in the current PATH.
|
REM The formatting script expects clang-format to be in the current PATH.
|
||||||
set PATH=%CF_PATH%;%PATH%
|
set PATH=%CF_PATH%;%PATH%
|
||||||
|
|
3
make.bat
3
make.bat
|
@ -113,9 +113,6 @@ if "%TEST%" == "1" (
|
||||||
goto EOF
|
goto EOF
|
||||||
)
|
)
|
||||||
|
|
||||||
call "%BLENDER_DIR%\build_files\windows\check_submodules.cmd"
|
|
||||||
if errorlevel 1 goto EOF
|
|
||||||
|
|
||||||
if "%BUILD_WITH_NINJA%" == "" (
|
if "%BUILD_WITH_NINJA%" == "" (
|
||||||
call "%BLENDER_DIR%\build_files\windows\configure_msbuild.cmd"
|
call "%BLENDER_DIR%\build_files\windows\configure_msbuild.cmd"
|
||||||
if errorlevel 1 goto EOF
|
if errorlevel 1 goto EOF
|
||||||
|
|
Loading…
Reference in New Issue