[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57306] trunk/blender/source/blender/ editors/render/render_update.c: Fix #35677, #35525: cycles viewport not updating properly in some situations.

[Brecht Van Lommel]

Revision: 57306
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57306
Author:   blendix
Date:     2013-06-09 11:57:50 +0000 (Sun, 09 Jun 2013)
Log Message:
-----------
Fix #35677, #35525: cycles viewport not updating properly in some situations.

Revision 56883 broke a mechanism where cycles tags itself to be updated later
while it is busy.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56883

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_update.c

Modified: trunk/blender/source/blender/editors/render/render_update.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_update.c	2013-06-09 10:04:25 UTC (rev 57305)
+++ trunk/blender/source/blender/editors/render/render_update.c	2013-06-09 11:57:50 UTC (rev 57306)
@@ -83,10 +83,6 @@
 	wmWindow *win;
 	static int recursive_check = FALSE;
 
-	/* why do this function then? :) */
-	if (updated == 0)
-		return;
-	
 	/* don't do this render engine update if we're updating the scene from
 	 * other threads doing e.g. rendering or baking jobs */
 	if (!BLI_thread_is_main())
@@ -126,6 +122,9 @@
 				rv3d = ar->regiondata;
 				engine = rv3d->render_engine;
 
+				/* call update if the scene changed, or if the render engine
+				 * tagged itself for update (e.g. because it was busy at the
+				 * time of the last update) */
 				if (engine && (updated || (engine->flag & RE_ENGINE_DO_UPDATE))) {
 
 					CTX_wm_screen_set(C, sc);