diff options
author | Thomas Dinges <blender@dingto.org> | 2022-07-27 18:14:21 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2022-07-27 18:14:21 +0300 |
commit | 32a9aac3b84f4742937dd8fd2afc14a443cb0248 (patch) | |
tree | 8dc2f8ade46f4cde0632479bb9af079745f394a2 | |
parent | 83362f87bb3b1f079a662f87d1343c628fa9ba35 (diff) |
Blender 3.3 - Beta
* BLENDER_VERSION_CYCLE set to beta
* Update pipeline_config.yaml to point to 3.2 branches and svn tags
* Update and uncomment BLENDER_VERSION in download.cmake
-rw-r--r-- | build_files/build_environment/cmake/download.cmake | 2 | ||||
-rw-r--r-- | build_files/config/pipeline_config.yaml | 18 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_blender_version.h | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/build_files/build_environment/cmake/download.cmake b/build_files/build_environment/cmake/download.cmake index 547bf77f8dd..76744aa9b0c 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.1) +set(BLENDER_VERSION 3.3) 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 82cd009ea95..aedaf35629b 100644 --- a/build_files/config/pipeline_config.yaml +++ b/build_files/config/pipeline_config.yaml @@ -5,38 +5,38 @@ update-code: git: submodules: - - branch: master + - branch: blender-v3.3-release commit_id: HEAD path: release/scripts/addons - - branch: master + - branch: blender-v3.3-release commit_id: HEAD path: release/scripts/addons_contrib - - branch: master + - branch: blender-v3.3-release commit_id: HEAD path: release/datafiles/locale - - branch: master + - branch: blender-v3.3-release commit_id: HEAD path: source/tools svn: libraries: darwin-arm64: - branch: trunk + branch: tags/blender-3.3-release commit_id: HEAD path: lib/darwin_arm64 darwin-x86_64: - branch: trunk + branch: tags/blender-3.3-release commit_id: HEAD path: lib/darwin linux-x86_64: - branch: trunk + branch: tags/blender-3.3-release commit_id: HEAD path: lib/linux_centos7_x86_64 windows-amd64: - branch: trunk + branch: tags/blender-3.3-release commit_id: HEAD path: lib/win64_vc15 tests: - branch: trunk + branch: tags/blender-3.3-release 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 605e700dd16..2067730faca 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 alpha +#define BLENDER_VERSION_CYCLE beta /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION |