diff options
author | Thomas Dinges <blender@dingto.org> | 2022-05-02 12:06:21 +0300 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2022-05-02 12:06:21 +0300 |
commit | 4f3b562506863bc9f53f700a3c5e92a9e0d9cfb0 (patch) | |
tree | dd9dc904e95afefb15184eb9f0031c5d034c8acc | |
parent | 0c80a0acd87cf3f641441d210e794df725f8d834 (diff) |
Revert "Blender 3.2 - Beta"
This reverts commit da46ed9116cd3a82f440cfec180728f0b3871d9c.
-rw-r--r-- | build_files/build_environment/cmake/download.cmake | 2 | ||||
-rw-r--r-- | build_files/config/pipeline_config.yaml | 18 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_blender_version.h | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/build_files/build_environment/cmake/download.cmake b/build_files/build_environment/cmake/download.cmake index 92dea453133..80c53d05c28 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.2) +# set(BLENDER_VERSION 3.1) 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 d1f1fe78d21..8222f2ff0b9 100644 --- a/build_files/config/pipeline_config.yaml +++ b/build_files/config/pipeline_config.yaml @@ -5,38 +5,38 @@ update-code: git: submodules: - - branch: blender-v3.2-release + - branch: master commit_id: HEAD path: release/scripts/addons - - branch: blender-v3.2-release + - branch: master commit_id: HEAD path: release/scripts/addons_contrib - - branch: blender-v3.2-release + - branch: master commit_id: HEAD path: release/datafiles/locale - - branch: blender-v3.2-release + - branch: master commit_id: HEAD path: source/tools svn: libraries: darwin-arm64: - branch: tags/blender-3.2-release + branch: trunk commit_id: HEAD path: lib/darwin_arm64 darwin-x86_64: - branch: tags/blender-3.2-release + branch: trunk commit_id: HEAD path: lib/darwin linux-x86_64: - branch: tags/blender-3.2-release + branch: trunk commit_id: HEAD path: lib/linux_centos7_x86_64 windows-amd64: - branch: tags/blender-3.2-release + branch: trunk commit_id: HEAD path: lib/win64_vc15 tests: - branch: tags/blender-3.2-release + branch: trunk commit_id: HEAD path: lib/tests benchmarks: diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 2ae7fb2d9c5..ab13a2e85d0 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 beta +#define BLENDER_VERSION_CYCLE alpha /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION |