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:
authorSam Kottler <dev@samkottler.net>2020-08-20 19:40:02 +0300
committerSam Kottler <dev@samkottler.net>2020-08-20 19:40:02 +0300
commit9dd50b39a433dc09b634d70ca8533ad19b4d1d5e (patch)
tree96341c40a13f620aa7f6a92fd6783dc6883216b0 /intern/cycles/blender/CMakeLists.txt
parent35624cdfe5186ee916e4519a013ef5c078d9c667 (diff)
parentc74b4caa724bf74de41ba3928cdd824aa9ba59d2 (diff)
Merge remote-tracking branch 'origin/blender-v2.90-release' into soc-2020-production-ready-light-tree-2soc-2020-production-ready-light-tree-2
Diffstat (limited to 'intern/cycles/blender/CMakeLists.txt')
-rw-r--r--intern/cycles/blender/CMakeLists.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
index 2316800e21e..e0fa45dffbc 100644
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -109,6 +109,10 @@ if(WITH_OPENIMAGEDENOISE)
)
endif()
+if(WITH_EXPERIMENTAL_FEATURES)
+ add_definitions(-DWITH_HAIR_NODES)
+endif()
+
blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
# avoid link failure with clang 3.4 debug