blender
/
blender
135
403
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

make.bat: skip SVN update when running make code_update 

regression from rB116d7b0042bba7d6cabd8e04c7d020ac3816caf3
This commit is contained in:
Ray molenkamp 2022-10-29 11:25:33 -06:00
parent 78fe6d7ab1
commit d1d2f002c7
Notes: blender-bot 2024-05-08 11:36:44 +02:00 
Referenced by issue #102169, Blender quickly slows down to grinding halt until hiding-unhiding blender window
Referenced by issue #102015, AV1 - No valid formats found
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/windows/parse_arguments.cmd
View File

@ -80,9 +80,11 @@ if NOT "%1" == "" (
REM Non-Build Commands
) else if "%1" == "update" (
SET BUILD_UPDATE=1
SET BUILD_UPDATE_SVN=1
set BUILD_UPDATE_ARGS=
) else if "%1" == "code_update" (
SET BUILD_UPDATE=1
SET BUILD_UPDATE_SVN=0
set BUILD_UPDATE_ARGS="--no-libraries"
) else if "%1" == "ninja" (
SET BUILD_WITH_NINJA=1

1
build_files/windows/reset_variables.cmd
View File

@ -34,3 +34,4 @@ set BUILD_WITH_SCCACHE=
set ICONS=
set ICONS_GEOM=
set DOC_PY=
SET BUILD_UPDATE_SVN=

12
make.bat
View File

@ -65,11 +65,13 @@ if "%BUILD_UPDATE%" == "1" (
REM First see if the SVN libs are there and check them out if they are not.
call "%BLENDER_DIR%\build_files\windows\check_libraries.cmd"
if errorlevel 1 goto EOF
REM Then update SVN platform libraries, since updating python while python is
REM running tends to be problematic. The python script that update_sources
REM calls later on may still try to switch branches and run into trouble,
REM but for *most* people this will side step the problem.
call "%BLENDER_DIR%\build_files\windows\svn_update.cmd"
if "%BUILD_UPDATE_SVN%" == "1" (
REM Then update SVN platform libraries, since updating python while python is
REM running tends to be problematic. The python script that update_sources
REM calls later on may still try to switch branches and run into trouble,
REM but for *most* people this will side step the problem.
call "%BLENDER_DIR%\build_files\windows\svn_update.cmd"
)
REM Finally call the python script shared between all platforms that updates git
REM and does any other SVN work like update the tests or branch switches
REM if required.