From 8e183a83b7aa3bbdefcdea6a86ca2c0dbd00417f Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 30 Oct 2018 14:36:48 +0100 Subject: 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. --- GNUmakefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '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 # ----------------------------------------------------------------------------- -- cgit v1.2.3