diff --git a/.gitmodules b/.gitmodules index 7a640a2132e..d3824a75ff8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,33 +2,33 @@ update = none path = lib/linux_x64 url = https://projects.blender.org/blender/lib-linux_x64.git - branch = blender-v4.2-release + branch = main [submodule "lib/macos_arm64"] update = none path = lib/macos_arm64 url = https://projects.blender.org/blender/lib-macos_arm64.git - branch = blender-v4.2-release + branch = main [submodule "lib/macos_x64"] update = none path = lib/macos_x64 url = https://projects.blender.org/blender/lib-macos_x64.git - branch = blender-v4.2-release + branch = main [submodule "lib/windows_x64"] update = none path = lib/windows_x64 url = https://projects.blender.org/blender/lib-windows_x64.git - branch = blender-v4.2-release + branch = main [submodule "lib/windows_arm64"] update = none path = lib/windows_arm64 url = https://projects.blender.org/blender/lib-windows_arm64.git - branch = blender-v4.2-release + branch = main [submodule "release/datafiles/assets"] path = release/datafiles/assets url = https://projects.blender.org/blender/blender-assets.git - branch = blender-v4.2-release + branch = main [submodule "tests/data"] update = none path = tests/data url = https://projects.blender.org/blender/blender-test-data.git - branch = blender-v4.2-release + branch = main diff --git a/build_files/build_environment/cmake/download.cmake b/build_files/build_environment/cmake/download.cmake index 587b01269c0..e94e4bbc94c 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 4.2) +# set(BLENDER_VERSION 3.1) function(download_source dep) set(TARGET_FILE ${${dep}_FILE}) diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png index a8c5d9390e0..4475ee064ac 100644 Binary files a/release/datafiles/splash.png and b/release/datafiles/splash.png differ diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 0f8b4c57a7a..5f40cc073d3 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -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 beta +#define BLENDER_VERSION_CYCLE alpha /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION