Merge branch 'blender-v3.4-release'

This commit is contained in:
Thomas Dinges 2022-11-03 10:12:17 +01:00
commit 31c52bc34e
3 changed files with 11 additions and 11 deletions

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
## Update and uncomment this in the release branch ## Update and uncomment this in the release branch
# set(BLENDER_VERSION 3.1) set(BLENDER_VERSION 3.4)
function(download_source dep) function(download_source dep)
set(TARGET_FILE ${${dep}_FILE}) set(TARGET_FILE ${${dep}_FILE})

@ -5,38 +5,38 @@
update-code: update-code:
git: git:
submodules: submodules:
- branch: master - branch: blender-v3.4-release
commit_id: HEAD commit_id: HEAD
path: release/scripts/addons path: release/scripts/addons
- branch: master - branch: blender-v3.4-release
commit_id: HEAD commit_id: HEAD
path: release/scripts/addons_contrib path: release/scripts/addons_contrib
- branch: master - branch: blender-v3.4-release
commit_id: HEAD commit_id: HEAD
path: release/datafiles/locale path: release/datafiles/locale
- branch: master - branch: blender-v3.4-release
commit_id: HEAD commit_id: HEAD
path: source/tools path: source/tools
svn: svn:
libraries: libraries:
darwin-arm64: darwin-arm64:
branch: trunk branch: tags/blender-3.4-release
commit_id: HEAD commit_id: HEAD
path: lib/darwin_arm64 path: lib/darwin_arm64
darwin-x86_64: darwin-x86_64:
branch: trunk branch: tags/blender-3.4-release
commit_id: HEAD commit_id: HEAD
path: lib/darwin path: lib/darwin
linux-x86_64: linux-x86_64:
branch: trunk branch: tags/blender-3.4-release
commit_id: HEAD commit_id: HEAD
path: lib/linux_centos7_x86_64 path: lib/linux_centos7_x86_64
windows-amd64: windows-amd64:
branch: trunk branch: tags/blender-3.4-release
commit_id: HEAD commit_id: HEAD
path: lib/win64_vc15 path: lib/win64_vc15
tests: tests:
branch: trunk branch: tags/blender-3.4-release
commit_id: HEAD commit_id: HEAD
path: lib/tests path: lib/tests
benchmarks: benchmarks:

@ -21,7 +21,7 @@ extern "C" {
/* Blender patch version for bugfix releases. */ /* Blender patch version for bugfix releases. */
#define BLENDER_VERSION_PATCH 0 #define BLENDER_VERSION_PATCH 0
/** Blender release cycle stage: alpha/beta/rc/release. */ /** Blender release cycle stage: alpha/beta/rc/release. */
#define BLENDER_VERSION_CYCLE alpha #define BLENDER_VERSION_CYCLE beta
/* Blender file format version. */ /* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION #define BLENDER_FILE_VERSION BLENDER_VERSION