Chris_Blackbourn/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests 1 Activity

WIP: uv-simple-select #1

Closed
Chris Blackbourn wants to merge 182 commits from uv-simple-select into main
pull from: uv-simple-select
merge into: Chris_Blackbourn:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 182 Files Changed 881 +11 -11
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 765bd10501 - Show all commits

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

@ -1,7 +1,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.5) # set(BLENDER_VERSION 3.1)
function(download_source dep) function(download_source dep)
set(TARGET_FILE ${${dep}_FILE}) set(TARGET_FILE ${${dep}_FILE})

18
build_files/config/pipeline_config.yaml
View File

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

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

@ -21,7 +21,7 @@ extern "C" {
/* Blender patch version for bugfix releases. */ /* Blender patch version for bugfix 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 beta #define BLENDER_VERSION_CYCLE alpha
/* TODO proper version bump. */ /* TODO proper version bump. */