From ea5b1f7527640dfd17d1eb12dddb4a5c895b296b Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Wed, 4 Jun 2025 14:10:17 +0200 Subject: [PATCH] Release: Update 4.5 branch to beta Splash by Blender Studio --- .gitmodules | 10 +++++----- build_files/build_environment/cmake/download.cmake | 2 +- release/datafiles/splash.png | 4 ++-- source/blender/blenkernel/BKE_blender_version.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5a5afc1723f..8e076ce6344 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,24 +2,24 @@ update = none path = lib/linux_x64 url = https://projects.blender.org/blender/lib-linux_x64.git - branch = main + branch = blender-v4.5-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.5-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.5-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.5-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.5-release diff --git a/build_files/build_environment/cmake/download.cmake b/build_files/build_environment/cmake/download.cmake index cab987c2ea8..1cdd059e799 100644 --- a/build_files/build_environment/cmake/download.cmake +++ b/build_files/build_environment/cmake/download.cmake @@ -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.5) function(download_source dep) set(TARGET_FILE ${${dep}_FILE}) diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png index 5171ef4c12f..5e86bd33b75 100644 --- a/release/datafiles/splash.png +++ b/release/datafiles/splash.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c88bb0b509cb589d6909e9ce296e16578cc49dbd7997ee731b224ae9b77ab486 -size 730581 +oid sha256:1d10a8faddbddeeee97ed81ee1fc2283fd29f035ded278228d6daf65f00a067e +size 570611 diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 1d9491ade0a..c3c1ece4fa9 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -21,7 +21,7 @@ /** 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 release type suffix. LTS or blank. */ #define BLENDER_VERSION_SUFFIX