diff options
| author | Stefan Werner <stefan.werner@tangent-animation.com> | 2020-09-01 15:47:34 +0300 |
|---|---|---|
| committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2020-09-01 22:00:55 +0300 |
| commit | 009971ba7adc9603b90e9bf99b6b6d53eeae6c3a (patch) | |
| tree | 0034d9a0a5703069816439564729a17740e0e727 /intern/cycles/device/device.h | |
| parent | f2d26409e83b1769c3a4baa2e5fa80e944f74678 (diff) | |
Cycles: Separate Embree device for each CPU Device.
Before, Cycles was using a shared Embree device across all instances.
This could result in crashes when viewport rendering and material
preview were using Cycles simultaneously.
Fixes issue T80042
Maniphest Tasks: T80042
Differential Revision: https://developer.blender.org/D8772
Diffstat (limited to 'intern/cycles/device/device.h')
| -rw-r--r-- | intern/cycles/device/device.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index 58472f645e0..ddf608aa430 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -371,6 +371,12 @@ class Device { return NULL; } + /* Device specific pointer for BVH creation. Currently only used by Embree. */ + virtual void *bvh_device() const + { + return NULL; + } + /* load/compile kernels, must be called before adding tasks */ virtual bool load_kernels(const DeviceRequestedFeatures & /*requested_features*/) { |