[Bf-blender-cvs] [d1d2f002c7c] master: make.bat: skip SVN update when running make code_update

[Ray Molenkamp]

Commit: d1d2f002c7caaf4ab457ec27bbc44666d7aac624
Author: Ray Molenkamp
Date:   Sat Oct 29 11:25:33 2022 -0600
Branches: master
https://developer.blender.org/rBd1d2f002c7caaf4ab457ec27bbc44666d7aac624

make.bat: skip SVN update when running make code_update

regression from rB116d7b0042bba7d6cabd8e04c7d020ac3816caf3

===================================================================

M	build_files/windows/parse_arguments.cmd
M	build_files/windows/reset_variables.cmd
M	make.bat

===================================================================

diff --git a/build_files/windows/parse_arguments.cmd b/build_files/windows/parse_arguments.cmd
index eaf4a85f7ac..a2ff4c1ff95 100644
--- a/build_files/windows/parse_arguments.cmd
+++ b/build_files/windows/parse_arguments.cmd
@@ -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
diff --git a/build_files/windows/reset_variables.cmd b/build_files/windows/reset_variables.cmd
index 8ba7b4d3307..37c5d1034ea 100644
--- a/build_files/windows/reset_variables.cmd
+++ b/build_files/windows/reset_variables.cmd
@@ -34,3 +34,4 @@ set BUILD_WITH_SCCACHE=
 set ICONS=
 set ICONS_GEOM=
 set DOC_PY=
+SET BUILD_UPDATE_SVN=
\ No newline at end of file
diff --git a/make.bat b/make.bat
index 0be70053ce1..394b2d0dad5 100644
--- a/make.bat
+++ b/make.bat
@@ -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.