diff options
| author | Thomas Dinges <blender@dingto.org> | 2022-07-27 18:31:49 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2022-07-27 18:31:49 +0300 |
| commit | 3b71a62390aed9079c5c245b826436e49fa91623 (patch) | |
| tree | 62eaff8e96999048a91b51947a70dbe662167646 | |
| parent | 9015952c9c0075b46d20204328ac17ee96e54881 (diff) | |
| parent | d61ab45385eba116dbfcbf6c5ccfb997be7e324f (diff) | |
Merge branch 'blender-v3.3-release'
| -rw-r--r-- | build_files/build_environment/cmake/download.cmake | 2 | ||||
| -rw-r--r-- | build_files/config/pipeline_config.yaml | 18 | ||||
| -rw-r--r-- | release/datafiles/splash.png | bin | 842492 -> 1091604 bytes | |||
| -rw-r--r-- | source/blender/blenkernel/BKE_blender_version.h | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/build_files/build_environment/cmake/download.cmake b/build_files/build_environment/cmake/download.cmake index 547bf77f8dd..76744aa9b0c 100644 --- 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.3) function(download_source dep) set(TARGET_FILE ${${dep}_FILE}) diff --git a/build_files/config/pipeline_config.yaml b/build_files/config/pipeline_config.yaml index 82cd009ea95..aedaf35629b 100644 --- a/build_files/config/pipeline_config.yaml +++ b/build_files/config/pipeline_config.yaml @@ -5,38 +5,38 @@ update-code: git: submodules: - - branch: master + - branch: blender-v3.3-release commit_id: HEAD path: release/scripts/addons - - branch: master + - branch: blender-v3.3-release commit_id: HEAD path: release/scripts/addons_contrib - - branch: master + - branch: blender-v3.3-release commit_id: HEAD path: release/datafiles/locale - - branch: master + - branch: blender-v3.3-release commit_id: HEAD path: source/tools svn: libraries: darwin-arm64: - branch: trunk + branch: tags/blender-3.3-release commit_id: HEAD path: lib/darwin_arm64 darwin-x86_64: - branch: trunk + branch: tags/blender-3.3-release commit_id: HEAD path: lib/darwin linux-x86_64: - branch: trunk + branch: tags/blender-3.3-release commit_id: HEAD path: lib/linux_centos7_x86_64 windows-amd64: - branch: trunk + branch: tags/blender-3.3-release commit_id: HEAD path: lib/win64_vc15 tests: - branch: trunk + branch: tags/blender-3.3-release commit_id: HEAD path: lib/tests benchmarks: diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png Binary files differindex eb1250cf5a5..d7c9cdd3a8f 100644 --- a/release/datafiles/splash.png +++ b/release/datafiles/splash.png diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index ee9c7a964d9..61d51809039 100644 --- 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 diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 778c6a6bfdd..aaadd36341f 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -26,6 +26,7 @@ set(DEFSRC rna_context.c rna_curve.c rna_curveprofile.c + rna_curves.c rna_depsgraph.c rna_dynamicpaint.c rna_fcurve.c @@ -85,7 +86,6 @@ set(DEFSRC if(WITH_EXPERIMENTAL_FEATURES) add_definitions(-DWITH_SIMULATION_DATABLOCK) list(APPEND DEFSRC - rna_curves.c rna_simulation.c ) endif() |
