Merge branch 'blender-v4.2-release'

This commit is contained in:
Thomas Dinges 2024-06-05 12:33:09 +02:00
commit 7c6d8154bd
4 changed files with 9 additions and 9 deletions

14
.gitmodules vendored

@ -2,33 +2,33 @@
update = none
path = lib/linux_x64
url = https://projects.blender.org/blender/lib-linux_x64.git
branch = main
branch = blender-v4.2-release
[submodule "lib/macos_arm64"]
update = none
path = lib/macos_arm64
url = https://projects.blender.org/blender/lib-macos_arm64.git
branch = main
branch = blender-v4.2-release
[submodule "lib/macos_x64"]
update = none
path = lib/macos_x64
url = https://projects.blender.org/blender/lib-macos_x64.git
branch = main
branch = blender-v4.2-release
[submodule "lib/windows_x64"]
update = none
path = lib/windows_x64
url = https://projects.blender.org/blender/lib-windows_x64.git
branch = main
branch = blender-v4.2-release
[submodule "lib/windows_arm64"]
update = none
path = lib/windows_arm64
url = https://projects.blender.org/blender/lib-windows_arm64.git
branch = main
branch = blender-v4.2-release
[submodule "release/datafiles/assets"]
path = release/datafiles/assets
url = https://projects.blender.org/blender/blender-assets.git
branch = main
branch = blender-v4.2-release
[submodule "tests/data"]
update = none
path = tests/data
url = https://projects.blender.org/blender/blender-test-data.git
branch = main
branch = blender-v4.2-release

@ -3,7 +3,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 4.2)
function(download_source dep)
set(TARGET_FILE ${${dep}_FILE})

Binary file not shown.

Before

Width:  |  Height:  |  Size: 714 KiB

After

Width:  |  Height:  |  Size: 751 KiB

@ -25,7 +25,7 @@ extern "C" {
/** Blender patch version for bug-fix 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