Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2018-10-30 16:55:45 +0300
committerRay Molenkamp <github@lazydodo.com>2018-10-30 16:55:45 +0300
commit2dbddaf3be57142a70fc1fb8f46997d67e980f57 (patch)
tree1b7dd4734ba3bf30d55c8e1e6bfaec4b203dd979 /build_files/windows
parent8e183a83b7aa3bbdefcdea6a86ca2c0dbd00417f (diff)
Fix "make update" on Windows not updating addons to the blender2.8 branch.
based on rB8e183a83b7aa3bbdefcdea6a86ca2c0dbd00417f
Diffstat (limited to 'build_files/windows')
-rw-r--r--build_files/windows/update_sources.cmd6
1 files changed, 5 insertions, 1 deletions
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