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:
Diffstat (limited to 'intern/cycles/device/device_multi.cpp')
-rw-r--r--intern/cycles/device/device_multi.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp
index 9ea8782d0f0..2e72a0b4393 100644
--- a/intern/cycles/device/device_multi.cpp
+++ b/intern/cycles/device/device_multi.cpp
@@ -237,6 +237,13 @@ class MultiDevice : public Device {
return true;
}
+ virtual void *bvh_device() const
+ {
+ /* CPU devices will always be at the back, so simply choose the last one.
+ There should only ever be one CPU device anyway and we need the Embree device for it. */
+ return devices.back().device->bvh_device();
+ }
+
virtual void *osl_memory()
{
if (devices.size() > 1) {