Merge branch 'blender-v3.6-release'

2023-05-17 13:05:15 +02:00
parent 7be3a0a727 2dd0a08aff
commit 04166c0af6
3 changed files with 2 additions and 2 deletions
--- 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.6)

 function(download_source dep)
  set(TARGET_FILE ${${dep}_FILE})
--- a/release/datafiles/splash.png
+++ b/release/datafiles/splash.png
--- 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