diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2016-12-07 13:23:22 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2016-12-07 13:23:22 +0300 |
| commit | 60d8ced602c47d30a83c745f81399904a471fa36 (patch) | |
| tree | 9663e7b6c79171dc26b2e167d27015270cade682 /intern/cycles/device/device.h | |
| parent | 083fe7eb46e65d94eb5dd7ebc2a43a495b3d88ea (diff) | |
| parent | 4b69b6d316c581630a5a8f3d86c1d63639b9ef2b (diff) | |
Merge branch 'master' into cycles_split_kernel
Diffstat (limited to 'intern/cycles/device/device.h')
| -rw-r--r-- | intern/cycles/device/device.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index 078ea2d4c57..c830648f024 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -242,6 +242,7 @@ public: DeviceInfo info; virtual const string& error_message() { return error_msg; } bool have_error() { return !error_message().empty(); } + virtual bool show_samples() const { return false; } /* statistics */ Stats &stats; |