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:
authorStefan Werner <stefan.werner@tangent-animation.com>2018-11-07 16:27:41 +0300
committerStefan Werner <stefan.werner@tangent-animation.com>2018-11-07 16:30:09 +0300
commit9d0eac6ba5efe1b3712152c337fb171a771a8921 (patch)
tree8d51f1b3800513d37211253cc3f93f6c2a929ca4 /intern/cycles/blender/blender_python.cpp
parent0c8aa85069fabd20d5f030f016a85ad060839066 (diff)
parentd3dd3739f6fe1ba640cdcad12d6bf4da6b356c59 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/blender/blender_python.cpp')
-rw-r--r--intern/cycles/blender/blender_python.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp
index a79c28e43aa..2a0a7895763 100644
--- a/intern/cycles/blender/blender_python.cpp
+++ b/intern/cycles/blender/blender_python.cpp
@@ -848,5 +848,13 @@ void *CCL_python_module_init()
Py_INCREF(Py_False);
#endif /* WITH_NETWORK */
+#ifdef WITH_EMBREE
+ PyModule_AddObject(mod, "with_embree", Py_True);
+ Py_INCREF(Py_True);
+#else /* WITH_EMBREE */
+ PyModule_AddObject(mod, "with_embree", Py_False);
+ Py_INCREF(Py_False);
+#endif /* WITH_EMBREE */
+
return (void*)mod;
}