diff options
author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2020-08-18 11:46:12 +0300 |
---|---|---|
committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2020-08-18 12:50:37 +0300 |
commit | c82166ffcd88dcb5fe5b694faa33043f1a4979b4 (patch) | |
tree | 246ef7896ddfacb994fa7274befea6d70794a98d /intern/cycles/device/device.h | |
parent | 286fc2233d18edf3006b796241a8afa3aa662c31 (diff) |
Cycles: move some Scene related methods out of Session
This moves `Session::get_requested_device_features`,
`Session::load_kernels`, and `Session::update_scene` out of `Session`
and into `Scene`, as mentioned in D8544.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D8590
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 && |