[Bf-blender-cvs] [2dbddaf3be5] blender2.8: Fix "make update" on Windows not updating addons to the blender2.8 branch.
Ray Molenkamp
noreply at git.blender.org
Tue Oct 30 14:55:55 CET 2018
Commit: 2dbddaf3be57142a70fc1fb8f46997d67e980f57
Author: Ray Molenkamp
Date: Tue Oct 30 07:55:45 2018 -0600
Branches: blender2.8
https://developer.blender.org/rB2dbddaf3be57142a70fc1fb8f46997d67e980f57
Fix "make update" on Windows not updating addons to the blender2.8 branch.
based on rB8e183a83b7aa3bbdefcdea6a86ca2c0dbd00417f
===================================================================
M build_files/windows/update_sources.cmd
===================================================================
diff --git a/build_files/windows/update_sources.cmd b/build_files/windows/update_sources.cmd
index 22d93fabb95..be5303ad1b5 100644
--- a/build_files/windows/update_sources.cmd
+++ b/build_files/windows/update_sources.cmd
@@ -11,6 +11,10 @@ if "%GIT%" == "" (
goto EOF
)
"%GIT%" pull --rebase
-"%GIT%" submodule foreach git pull --rebase origin master
+"%GIT%" submodule update --init --recursive
+rem Use blender2.8 branch for submodules that have it.
+"%GIT%" submodule foreach "git checkout blender2.8 || git checkout master"
+"%GIT%" submodule foreach git pull --rebase origin
+
:EOF
\ No newline at end of file
More information about the Bf-blender-cvs
mailing list