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:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-09-16 18:09:28 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-09-16 18:09:28 +0300
commitd96b8e168f3c809cd79f6028dbf99eeeebb71302 (patch)
tree75ee78ee75ea602c2c698f4b4ec8494093b949c7 /source/creator
parent76c99f361f58752eff8054f5cff52cad9ce57145 (diff)
parent4b39069908c88099860c04a3b7d3b4aae0a272f5 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index fc02dfda9d1..f65688e1304 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -338,7 +338,8 @@ if(WITH_PYTHON)
# install(CODE "message(\"copying blender scripts...\")")
# exclude addons_contrib if release
- if("${BLENDER_VERSION_CYCLE}" STREQUAL "release")
+ if("${BLENDER_VERSION_CYCLE}" STREQUAL "release" OR
+ "${BLENDER_VERSION_CYCLE}" STREQUAL "rc")
set(ADDON_EXCLUDE_CONDITIONAL "addons_contrib/*")
else()
set(ADDON_EXCLUDE_CONDITIONAL "_addons_contrib/*") # dummy, wont do anything