diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-02-13 11:50:41 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-02-13 11:50:41 +0400 |
| commit | ae385fb61cd8caa1024359f71f2e77a41ddb6e58 (patch) | |
| tree | 3ddae9d77270f11c22afda007e5b473c1620fcc4 /intern | |
| parent | bfb319925d775c08ce123567da3d857f9adf9fc8 (diff) | |
Correction for fix #34205: Zooming in rendered mode during update out of sync with intended zoom
Didn't initially notice one possibility when GPU render would fail here,
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/session.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 7a40e0d04b6..6ed14452c6b 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -210,7 +210,12 @@ void Session::run_gpu() * wait for pause condition notify to wake up again */ thread_scoped_lock pause_lock(pause_mutex); - if(pause || no_tiles) { + if(!pause && !tile_manager.done()) { + /* reset could have happened after no_tiles was set, before this lock. + * in this case we shall not wait for pause condition + */ + } + else if(pause || no_tiles) { update_status_time(pause, no_tiles); while(1) { |