[Bf-blender-cvs] [a16dd407b3d] master: Revert "Blender 3.4 - Beta"
Thomas Dinges
noreply at git.blender.org
Thu Nov 3 10:13:25 CET 2022
Commit: a16dd407b3d3f830c40646fcda5ea5b89b3ad4ee
Author: Thomas Dinges
Date: Thu Nov 3 10:12:46 2022 +0100
Branches: master
https://developer.blender.org/rBa16dd407b3d3f830c40646fcda5ea5b89b3ad4ee
Revert "Blender 3.4 - Beta"
This reverts commit 666135c32af3032d1e6c62ee953d65f399da7d0f.
===================================================================
M build_files/build_environment/cmake/download.cmake
M build_files/config/pipeline_config.yaml
M source/blender/blenkernel/BKE_blender_version.h
===================================================================
diff --git a/build_files/build_environment/cmake/download.cmake b/build_files/build_environment/cmake/download.cmake
index 5db1a4e56fa..8d75f0ff0ed 100644
--- a/build_files/build_environment/cmake/download.cmake
+++ b/build_files/build_environment/cmake/download.cmake
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
## Update and uncomment this in the release branch
-set(BLENDER_VERSION 3.4)
+# set(BLENDER_VERSION 3.1)
function(download_source dep)
set(TARGET_FILE ${${dep}_FILE})
diff --git a/build_files/config/pipeline_config.yaml b/build_files/config/pipeline_config.yaml
index 7c8f15de777..3359f89c41e 100644
--- a/build_files/config/pipeline_config.yaml
+++ b/build_files/config/pipeline_config.yaml
@@ -5,38 +5,38 @@
update-code:
git:
submodules:
- - branch: blender-v3.4-release
+ - branch: master
commit_id: HEAD
path: release/scripts/addons
- - branch: blender-v3.4-release
+ - branch: master
commit_id: HEAD
path: release/scripts/addons_contrib
- - branch: blender-v3.4-release
+ - branch: master
commit_id: HEAD
path: release/datafiles/locale
- - branch: blender-v3.4-release
+ - branch: master
commit_id: HEAD
path: source/tools
svn:
libraries:
darwin-arm64:
- branch: tags/blender-3.4-release
+ branch: trunk
commit_id: HEAD
path: lib/darwin_arm64
darwin-x86_64:
- branch: tags/blender-3.4-release
+ branch: trunk
commit_id: HEAD
path: lib/darwin
linux-x86_64:
- branch: tags/blender-3.4-release
+ branch: trunk
commit_id: HEAD
path: lib/linux_centos7_x86_64
windows-amd64:
- branch: tags/blender-3.4-release
+ branch: trunk
commit_id: HEAD
path: lib/win64_vc15
tests:
- branch: tags/blender-3.4-release
+ branch: trunk
commit_id: HEAD
path: lib/tests
benchmarks:
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 82b75d5b598..4bffa5492b5 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -21,7 +21,7 @@ extern "C" {
/* Blender patch version for bugfix releases. */
#define BLENDER_VERSION_PATCH 0
/** Blender release cycle stage: alpha/beta/rc/release. */
-#define BLENDER_VERSION_CYCLE beta
+#define BLENDER_VERSION_CYCLE alpha
/* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION
More information about the Bf-blender-cvs
mailing list