Commit: c9df453ce70bdf36a4567f8a97b977c1f5e6dfd7
Author: Brecht Van Lommel
Date: Thu Dec 20 14:45:55 2018 +0100
Branches: master
https://developer.blender.org/rBc9df453ce70bdf36a4567f8a97b977c1f5e6dfd7
Update for moving blender2.8 to master.
===================================================================
M .arcconfig
M .gitmodules
M GNUmakefile
M build_files/buildbot/slave_pack.py
M build_files/windows/update_sources.cmd
M release/scripts/addons
M release/scripts/addons_contrib
M source/tools
===================================================================
diff --git a/.arcconfig b/.arcconfig
index a9b4e2ea3c3..4a126cd6d01 100644
--- a/.arcconfig
+++ b/.arcconfig
@@ -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"
}
diff --git a/.gitmodules b/.gitmodules
index 73ee23b2e1d..a8f3a3f80ab 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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
diff --git a/GNUmakefile b/GNUmakefile
index f692daed600..21183220b80 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -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
# -----------------------------------------------------------------------------
diff --git a/build_files/buildbot/slave_pack.py
b/build_files/buildbot/slave_pack.py
index 22cf386c77a..2eaf9c23601 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -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"
diff --git a/build_files/windows/update_sources.cmd
b/build_files/windows/update_sources.cmd
index be5303ad1b5..3906af27cb9 100644
--- a/build_files/windows/update_sources.cmd
+++ b/build_files/windows/update_sources.cmd
@@ -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
diff --git a/release/scripts/addons b/release/scripts/addons
index f89d1c9581c..0457976a872 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit f89d1c9581c03160485a7b4b09fa5d538331fdeb
+Subproject commit 0457976a872000993202763abe7503c76b461122
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 41d528d76b9..ceb054a0f92 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 41d528d76b99e689e09915f5dcd589480579ef3a
+Subproject commit ceb054a0f923fa49cd9e8ef20322261a26160151
diff --git a/source/tools b/source/tools
index 30d4611eacb..2278dd8d6ae 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 30d4611eacb1c5b27a5e9d2432cb12843054abc9
+Subproject commit 2278dd8d6aea4d56632dee37196a5e341ce99283
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
