Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2021-11-25 20:22:20 +0300
committerBrecht Van Lommel <brecht@blender.org>2021-11-25 20:24:46 +0300
commit2fb8c6805a982c3b617abc60459c6f40c7a9230c (patch)
tree8c11eddf85c970a02c1c7510a6a17718aef7c895 /CMakeLists.txt
parente6a41e1c806b318eaa866fdc2a100c4e7fedfb15 (diff)
Fix build error with experimental features after recent release cycle bump
Hair, pointcloud and simulation datablock types should be disabled in the beta cycles already like other experimental features.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2e2d02dcde..fabac5030c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -494,7 +494,8 @@ endif()
# This should be turned off when Blender enter beta/rc/release
if("${BLENDER_VERSION_CYCLE}" STREQUAL "release" OR
- "${BLENDER_VERSION_CYCLE}" STREQUAL "rc")
+ "${BLENDER_VERSION_CYCLE}" STREQUAL "rc" OR
+ "${BLENDER_VERSION_CYCLE}" STREQUAL "beta")
set(WITH_EXPERIMENTAL_FEATURES OFF)
else()
set(WITH_EXPERIMENTAL_FEATURES ON)