[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54520] trunk/blender/intern/cycles/render /session.cpp: Correction for fix #34205: Zooming in rendered mode during update out of sync with intended zoom

[Sergey Sharybin]

Revision: 54520
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54520
Author:   nazgul
Date:     2013-02-13 07:50:41 +0000 (Wed, 13 Feb 2013)
Log Message:
-----------
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,

Modified Paths:
--------------
    trunk/blender/intern/cycles/render/session.cpp

Modified: trunk/blender/intern/cycles/render/session.cpp
===================================================================
--- trunk/blender/intern/cycles/render/session.cpp	2013-02-13 05:48:08 UTC (rev 54519)
+++ trunk/blender/intern/cycles/render/session.cpp	2013-02-13 07:50:41 UTC (rev 54520)
@@ -210,7 +210,12 @@
 			 * 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) {