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/blender/blender_session.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/blender/blender_session.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_session.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 5930a2800bf..7b80c520e72 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -372,12 +372,6 @@ void BlenderSession::synchronize() return; } - /* if the session is still resetting the device come back later */ - if(session->resetting()) { - tag_update(); - return; - } - /* increase samples, but never decrease */ session->set_samples(session_params.samples); session->set_pause(BlenderSync::get_session_pause(b_scene, background)); |