diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-17 16:07:06 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-17 16:07:06 +0400 |
| commit | efaf512406c71606d7f05eca10c74510bd9ebc12 (patch) | |
| tree | d42a01041ba165f13ad1b3c42bc118bd3c82b0c3 /intern/cycles/device/device.h | |
| parent | aecb2f7039f0af91bd1eb03a64957bcd532c9408 (diff) | |
Revert r50528: "Performance fix for Cycles: Don't wait in the main UI thread when resetting devices."
This commit leads to random freezes in Cycles rendering:
https://projects.blender.org/tracker/index.php?func=detail&aid=32545&group_id=9&atid=498
The goal of this commit was to remove UI lag for OSL, but since that is not officially supported yet, better revert it until a proper fix can be implemented in 2.65.
Diffstat (limited to 'intern/cycles/device/device.h')
| -rw-r--r-- | intern/cycles/device/device.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h index 8e3bc408399..2ee2e044618 100644 --- a/intern/cycles/device/device.h +++ b/intern/cycles/device/device.h @@ -115,7 +115,6 @@ public: virtual void task_add(DeviceTask& task) = 0; virtual void task_wait() = 0; virtual void task_cancel() = 0; - virtual bool task_cancelled() = 0; /* opengl drawing */ virtual void draw_pixels(device_memory& mem, int y, int w, int h, |