Update for moving blender2.8 to master.
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 20 Dec 2018 13:45:55 +0000 (14:45 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 21 Dec 2018 11:15:21 +0000 (12:15 +0100)
.arcconfig
.gitmodules
GNUmakefile
build_files/buildbot/slave_pack.py
build_files/windows/update_sources.cmd
release/scripts/addons
release/scripts/addons_contrib
source/tools

index a9b4e2e..4a126cd 100644 (file)
@@ -1,7 +1,7 @@
 {
        "project_id" : "Blender",
        "conduit_uri" : "https://developer.blender.org/",
-       "git.default-relative-commit" : "origin/blender2.8",
+       "git.default-relative-commit" : "origin/master",
        "arc.land.update.default" : "rebase",
-       "arc.land.onto.default" : "blender2.8"
+       "arc.land.onto.default" : "master"
 }
index 73ee23b..a8f3a3f 100644 (file)
@@ -1,12 +1,12 @@
 [submodule "release/scripts/addons"]
        path = release/scripts/addons
        url = ../blender-addons.git
-       branch = blender2.8
+       branch = master
        ignore = all
 [submodule "release/scripts/addons_contrib"]
        path = release/scripts/addons_contrib
        url = ../blender-addons-contrib.git
-       branch = blender2.8
+       branch = master
        ignore = all
 [submodule "release/datafiles/locale"]
        path = release/datafiles/locale
index f692dae..2118322 100644 (file)
@@ -458,9 +458,8 @@ update: .FORCE
        fi
        git pull --rebase
        git submodule update --init --recursive
-       # 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
+       git submodule foreach git checkout master
+       git submodule foreach git pull --rebase origin master
 
 
 # -----------------------------------------------------------------------------
index 22cf386..2eaf9c2 100644 (file)
@@ -107,8 +107,8 @@ if builder.find('cmake') != -1:
         if builder.endswith('vc2015'):
             platform += "-vc14"
         builderified_name = 'blender-{}-{}-{}'.format(blender_full_version, git_hash, platform)
-        # NOTE: Blender 2.8 is already respected by blender_full_version.
-        if branch != '' and branch != 'blender2.8':
+        # NOTE: Blender 2.7 is already respected by blender_full_version.
+        if branch != '' and branch != 'blender2.7':
             builderified_name = branch + "-" + builderified_name
 
         os.rename(result_file, "{}.zip".format(builderified_name))
@@ -173,8 +173,8 @@ if builder.find('cmake') != -1:
                                                       blender_hash,
                                                       blender_glibc,
                                                       blender_arch)
-        # NOTE: Blender 2.8 is already respected by blender_full_version.
-        if branch != '' and branch != 'blender2.8':
+        # NOTE: Blender 2.7 is already respected by blender_full_version.
+        if branch != '' and branch != 'blender2.7':
             package_name = branch + "-" + package_name
 
         upload_filename = package_name + ".tar.bz2"
index be5303a..3906af2 100644 (file)
@@ -11,10 +11,6 @@ if "%GIT%" == "" (
        goto EOF
 )
 "%GIT%" pull --rebase
-"%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
+"%GIT%" submodule foreach git pull --rebase origin master
 
-
-:EOF
\ No newline at end of file
+:EOF
index f89d1c9..0457976 160000 (submodule)
@@ -1 +1 @@
-Subproject commit f89d1c9581c03160485a7b4b09fa5d538331fdeb
+Subproject commit 0457976a872000993202763abe7503c76b461122
index 41d528d..ceb054a 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 41d528d76b99e689e09915f5dcd589480579ef3a
+Subproject commit ceb054a0f923fa49cd9e8ef20322261a26160151
index 30d4611..2278dd8 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 30d4611eacb1c5b27a5e9d2432cb12843054abc9
+Subproject commit 2278dd8d6aea4d56632dee37196a5e341ce99283