[Bf-blender-cvs] [8e183a83b7a] blender2.8: Fix "make update" on macOS/Linux not updating addons to the blender2.8 branch.

[Brecht Van Lommel]

Commit: 8e183a83b7aa3bbdefcdea6a86ca2c0dbd00417f
Author: Brecht Van Lommel
Date:   Tue Oct 30 14:36:48 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB8e183a83b7aa3bbdefcdea6a86ca2c0dbd00417f

Fix "make update" on macOS/Linux not updating addons to the blender2.8 branch.

This will need to be removed once we merge into master.

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

M	GNUmakefile

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

diff --git a/GNUmakefile b/GNUmakefile
index 21183220b80..f692daed600 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -458,8 +458,9 @@ update: .FORCE
 	fi
 	git pull --rebase
 	git submodule update --init --recursive
-	git submodule foreach git checkout master
-	git submodule foreach git pull --rebase origin master
+	# 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
 
 
 # -----------------------------------------------------------------------------