From 666135c32af3032d1e6c62ee953d65f399da7d0f Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Thu, 3 Nov 2022 10:08:10 +0100 Subject: [PATCH] Blender 3.4 - 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 --- .../build_environment/cmake/download.cmake | 2 +- build_files/config/pipeline_config.yaml | 18 +++++++++--------- .../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 8d75f0ff0ed..5db1a4e56fa 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.4) 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 3359f89c41e..7c8f15de777 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.4-release commit_id: HEAD path: release/scripts/addons - - branch: master + - branch: blender-v3.4-release commit_id: HEAD path: release/scripts/addons_contrib - - branch: master + - branch: blender-v3.4-release commit_id: HEAD path: release/datafiles/locale - - branch: master + - branch: blender-v3.4-release commit_id: HEAD path: source/tools svn: libraries: darwin-arm64: - branch: trunk + branch: tags/blender-3.4-release commit_id: HEAD path: lib/darwin_arm64 darwin-x86_64: - branch: trunk + branch: tags/blender-3.4-release commit_id: HEAD path: lib/darwin linux-x86_64: - branch: trunk + branch: tags/blender-3.4-release commit_id: HEAD path: lib/linux_centos7_x86_64 windows-amd64: - branch: trunk + branch: tags/blender-3.4-release commit_id: HEAD path: lib/win64_vc15 tests: - branch: trunk + branch: tags/blender-3.4-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 1a642cf4eb3..a7150913290 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