diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-30 16:36:48 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-10-30 16:43:09 +0300 |
| commit | 8e183a83b7aa3bbdefcdea6a86ca2c0dbd00417f (patch) | |
| tree | 7abd47cddb60f2f339ac0a380e9484561bcce822 /GNUmakefile | |
| parent | 450f0c4a903010ed0dd7a57cd8a08d93a0eb1809 (diff) | |
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.
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 5 |
1 files changed, 3 insertions, 2 deletions
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 # ----------------------------------------------------------------------------- |