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_multi.cpp | |
| 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_multi.cpp')
| -rw-r--r-- | intern/cycles/device/device_multi.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp index 4923e5c9e66..546ffe5e4b9 100644 --- a/intern/cycles/device/device_multi.cpp +++ b/intern/cycles/device/device_multi.cpp @@ -312,14 +312,6 @@ public: foreach(SubDevice& sub, devices) sub.device->task_cancel(); } - - bool task_cancelled() - { - foreach(SubDevice& sub, devices) - if (sub.device->task_cancelled()) - return true; - return false; - } }; Device *device_multi_create(DeviceInfo& info, bool background) |