diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-02-26 16:07:57 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2019-02-26 16:07:57 +0300 |
| commit | 15edae617fa4e77095953932b0e3120e91d5beb5 (patch) | |
| tree | 264b3f3473151d7ab4c5700bd6eb04c5aecdf4ab /intern/cycles/device/device.h | |
| parent | f76c15efb70207cf4e92708e0565110bbae854ab (diff) | |
| parent | dabe5cd31add8aa55b9ad4bce1b591ed4e98f1a1 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/device/device.h')
| -rw-r--r-- | intern/cycles/device/device.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index f58ce0a75ee..08b0e7435fe 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -149,6 +149,12 @@ public: /* Use raytracing in shaders. */ bool use_shader_raytrace; + /* Use true displacement */ + bool use_true_displacement; + + /* Use background lights */ + bool use_background_light; + DeviceRequestedFeatures() { /* TODO(sergey): Find more meaningful defaults. */ @@ -168,6 +174,8 @@ public: use_principled = false; use_denoising = false; use_shader_raytrace = false; + use_true_displacement = false; + use_background_light = false; } bool modified(const DeviceRequestedFeatures& requested_features) @@ -187,7 +195,9 @@ public: use_shadow_tricks == requested_features.use_shadow_tricks && use_principled == requested_features.use_principled && use_denoising == requested_features.use_denoising && - use_shader_raytrace == requested_features.use_shader_raytrace); + use_shader_raytrace == requested_features.use_shader_raytrace && + use_true_displacement == requested_features.use_true_displacement && + use_background_light == requested_features.use_background_light); } /* Convert the requested features structure to a build options, |