griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v5.0-release'

Browse Source
This commit is contained in:
Thomas Dinges
2025-10-08 12:04:02 +02:00
parent 515ccf61ed e3e8c283d5
commit 3c5c6508a9
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitmodules vendored
View File

@@ -2,19 +2,19 @@
update = none update = none
path = lib/linux_x64 path = lib/linux_x64
url = https://projects.blender.org/blender/lib-linux_x64.git url = https://projects.blender.org/blender/lib-linux_x64.git
branch = main branch = blender-v5.0-release
[submodule "lib/macos_arm64"] [submodule "lib/macos_arm64"]
update = none update = none
path = lib/macos_arm64 path = lib/macos_arm64
url = https://projects.blender.org/blender/lib-macos_arm64.git url = https://projects.blender.org/blender/lib-macos_arm64.git
branch = main branch = blender-v5.0-release
[submodule "lib/windows_x64"] [submodule "lib/windows_x64"]
update = none update = none
path = lib/windows_x64 path = lib/windows_x64
url = https://projects.blender.org/blender/lib-windows_x64.git url = https://projects.blender.org/blender/lib-windows_x64.git
branch = main branch = blender-v5.0-release
[submodule "lib/windows_arm64"] [submodule "lib/windows_arm64"]
update = none update = none
path = lib/windows_arm64 path = lib/windows_arm64
url = https://projects.blender.org/blender/lib-windows_arm64.git url = https://projects.blender.org/blender/lib-windows_arm64.git
branch = main branch = blender-v5.0-release

2
build_files/build_environment/cmake/download.cmake
View File

@@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
## Update and uncomment this in the release branch ## Update and uncomment this in the release branch
# set(BLENDER_VERSION 3.1) set(BLENDER_VERSION 5.1)
function(download_source dep) function(download_source dep)
set(TARGET_FILE ${${dep}_FILE}) set(TARGET_FILE ${${dep}_FILE})

2
source/blender/blenkernel/BKE_blender_version.h
View File

@@ -21,7 +21,7 @@
/** Blender patch version for bug-fix releases. */ /** Blender patch version for bug-fix releases. */
#define BLENDER_VERSION_PATCH 0 #define BLENDER_VERSION_PATCH 0
/** Blender release cycle stage: alpha/beta/rc/release. */ /** 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. */ /** Blender release type suffix. LTS or blank. */
#define BLENDER_VERSION_SUFFIX #define BLENDER_VERSION_SUFFIX

2
source/blender/editors/uvedit/uvedit_unwrap_ops.cc
View File

@@ -110,7 +110,7 @@ static bool uvedit_ensure_uvs(Object *obedit)
BMIter liter; BMIter liter;
BMLoop *l; BMLoop *l;
BM_elem_flag_enable(l->f, BM_ELEM_SELECT_UV); BM_elem_flag_enable(efa, BM_ELEM_SELECT_UV);
BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
BM_elem_flag_enable(l, BM_ELEM_SELECT_UV); BM_elem_flag_enable(l, BM_ELEM_SELECT_UV);
BM_elem_flag_enable(l, BM_ELEM_SELECT_UV_EDGE); BM_elem_flag_enable(l, BM_ELEM_SELECT_UV_EDGE);