Merge branch 'blender-v3.2-release'

This commit is contained in:
Thomas Dinges 2022-05-02 11:05:53 +02:00
commit 0c80a0acd8
5 changed files with 12 additions and 12 deletions

View File

@ -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.2)
function(download_source dep)
set(TARGET_FILE ${${dep}_FILE})

View File

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

@ -1 +1 @@
Subproject commit 2e715d54178e24ea463c7bc0cdeb27c682c39ecf
Subproject commit 44cf4b4bf74f22fff55941e39cebeacec68a5a80

Binary file not shown.

Before

Width:  |  Height:  |  Size: 823 KiB

After

Width:  |  Height:  |  Size: 1.1 MiB

View File

@ -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