UI: "vertex keys" -> "shape keys" #104868

Closed
Philipp Oeser wants to merge 38 commits from lichtwerk:cleanup_rename_vertex_keys into main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
3 changed files with 11 additions and 11 deletions
Showing only changes of commit d26cb0b00b - Show all commits

View File

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

View File

@ -5,38 +5,38 @@
update-code:
git:
submodules:
- branch: blender-v3.5-release
- branch: main
commit_id: HEAD
path: release/scripts/addons
- branch: blender-v3.5-release
- branch: main
commit_id: HEAD
path: release/scripts/addons_contrib
- branch: blender-v3.5-release
- branch: main
commit_id: HEAD
path: release/datafiles/locale
- branch: blender-v3.5-release
- branch: main
commit_id: HEAD
path: source/tools
svn:
libraries:
darwin-arm64:
branch: tags/blender-3.5-release
branch: trunk
commit_id: HEAD
path: lib/darwin_arm64
darwin-x86_64:
branch: tags/blender-3.5-release
branch: trunk
commit_id: HEAD
path: lib/darwin
linux-x86_64:
branch: tags/blender-3.5-release
branch: trunk
commit_id: HEAD
path: lib/linux_x86_64_glibc_228
windows-amd64:
branch: tags/blender-3.5-release
branch: trunk
commit_id: HEAD
path: lib/win64_vc15
tests:
branch: tags/blender-3.5-release
branch: trunk
commit_id: HEAD
path: lib/tests
benchmarks:

View File

@ -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 beta
#define BLENDER_VERSION_CYCLE alpha
/* TODO proper version bump. */