diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-23 00:49:33 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-23 00:49:33 +0400 |
| commit | 086e4ed825b7938400f14999acc7faf5f2594c00 (patch) | |
| tree | 487f841117ef8f33226061e4af0b5e79a32cb4e6 /intern/cycles/device/device.h | |
| parent | 055ddbc22de62e197f706e591932a7593dd3fb4c (diff) | |
Cycles: improve error reporting for opencl and cuda, showing error messages in
viewport instead of only console.
Diffstat (limited to 'intern/cycles/device/device.h')
| -rw-r--r-- | intern/cycles/device/device.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index 5d6ac10dc40..5552e6ab7e2 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -76,6 +76,7 @@ protected: Device() {} bool background; + string error_msg; public: virtual ~Device() {} @@ -84,6 +85,7 @@ public: /* info */ virtual string description() = 0; + const string& error_message() { return error_msg; } /* regular memory */ virtual void mem_alloc(device_memory& mem, MemoryType type) = 0; |