diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-01-04 22:06:32 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-01-04 22:06:32 +0400 |
| commit | 049ab984697aa277c476833670275624c4385257 (patch) | |
| tree | 28f01921f0372247a669b36fd4877d3011a1f73e /intern/cycles/render/session.h | |
| parent | cd84a43334f59d9ff613a240467bbec5c882b7da (diff) | |
Cycles: device code refactoring, no functional changes.
Diffstat (limited to 'intern/cycles/render/session.h')
| -rw-r--r-- | intern/cycles/render/session.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/render/session.h b/intern/cycles/render/session.h index 89979b8c451..a662948c15b 100644 --- a/intern/cycles/render/session.h +++ b/intern/cycles/render/session.h @@ -40,7 +40,7 @@ class Scene; class SessionParams { public: - DeviceType device_type; + DeviceInfo device; bool background; string output_path; @@ -57,7 +57,6 @@ public: SessionParams() { - device_type = DEVICE_CPU; background = false; output_path = ""; @@ -74,7 +73,8 @@ public: } bool modified(const SessionParams& params) - { return !(device_type == params.device_type + { return !(device.type == params.device.type + && device.id == params.device.id && background == params.background && output_path == params.output_path /* && samples == params.samples */ |