diff options
author | Hans Goudey <h.goudey@me.com> | 2020-09-01 20:35:14 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2020-09-01 20:38:05 +0300 |
commit | baca8611e5fe4b3dcd6f5065fb125bc0a9d65934 (patch) | |
tree | bb1230387cd53b15f9621f10c4d0e5e2050b5580 /intern/cycles/device/device.h | |
parent | 31705201dddebf7e3be5c4533b89f380aad1ede1 (diff) | |
parent | 2930d4fcea405985f2212c5f28c061af7c4849f8 (diff) |
Merge branch 'master' into active-fcurve-keyframeactive-fcurve-keyframe
Diffstat (limited to 'intern/cycles/device/device.h')
-rw-r--r-- | intern/cycles/device/device.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index 115b05e3911..58472f645e0 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -180,7 +180,6 @@ class DeviceRequestedFeatures { DeviceRequestedFeatures() { /* TODO(sergey): Find more meaningful defaults. */ - experimental = false; max_nodes_group = 0; nodes_features = 0; use_hair = false; @@ -203,8 +202,7 @@ class DeviceRequestedFeatures { bool modified(const DeviceRequestedFeatures &requested_features) { - return !(experimental == requested_features.experimental && - max_nodes_group == requested_features.max_nodes_group && + return !(max_nodes_group == requested_features.max_nodes_group && nodes_features == requested_features.nodes_features && use_hair == requested_features.use_hair && use_hair_thick == requested_features.use_hair_thick && |