Merge remote-tracking branch 'origin/blender-v4.1-release'
This commit is contained in:
commit
7c0a22cdaf
@ -26,7 +26,10 @@ if NOT EXIST "%BUILD_VS_LIBDIR%\.git" (
|
||||
echo *********************************************************
|
||||
:RETRY
|
||||
"%GIT%" -C "%BLENDER_DIR%\" config --local "submodule.%BUILD_VS_LIBDIR%.update" "checkout"
|
||||
set GIT_LFS_SKIP_SMUDGE=1
|
||||
"%GIT%" -C "%BLENDER_DIR%\" submodule update --progress --init "%BUILD_VS_LIBDIR%"
|
||||
set GIT_LFS_SKIP_SMUDGE=
|
||||
"%GIT%" -C "./%BUILD_VS_LIBDIR%" lfs pull
|
||||
if errorlevel 1 (
|
||||
set /p LibRetry= "Error during download, retry? y/n"
|
||||
if /I "!LibRetry!"=="Y" (
|
||||
|
@ -24,7 +24,7 @@ if EXIST %PYTHON% (
|
||||
)
|
||||
|
||||
if NOT EXIST %PYTHON% (
|
||||
if EXIST %BLENDER_DIR%\lib\windows_x64\ (
|
||||
if EXIST %BLENDER_DIR%\lib\windows_x64\.git (
|
||||
echo Warning: Python not found, there is likely an issue with the library folder
|
||||
)
|
||||
set PYTHON=""
|
||||
|
Loading…
Reference in New Issue
Block a user