[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58674] branches/soc-2013-cycles_mblur/ intern/cycles/blender/blender_object.cpp: Fix for an infinite loop on starting the viewport render in GPU mode.

Gavin Howard gavin.d.howard at gmail.com
Sat Jul 27 20:40:40 CEST 2013


Revision: 58674
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58674
Author:   gdh
Date:     2013-07-27 18:40:40 +0000 (Sat, 27 Jul 2013)
Log Message:
-----------
Fix for an infinite loop on starting the viewport render in GPU mode.

The problem was caused when I manually updated items that were already 
tracked. I figured out the problem on accident, actually. I remembered 
that what I was updating was motion, which isn't important for the 
viewport render anyway. I took out the update, but incredibly, the 
viewport still updated when I changed the settings.

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp

Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp	2013-07-27 18:17:19 UTC (rev 58673)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp	2013-07-27 18:40:40 UTC (rev 58674)
@@ -310,31 +310,27 @@
 
 	if(object_map.sync(&object, b_ob, b_parent, key))
 		object_updated = true;
-	
+
 	/* Get whether motion is enabled, and whether
 	 * the object will use deform blur. */
 	bool use_mblur = object_use_mblur(b_ob);
 	bool use_deform_mblur = object_use_deform_mblur(b_ob);
 	
-	/* Force update if necessary. */
+	/* We do not need to update the viewport. */
 	if (use_mblur != object->use_motion ||
 		use_deform_mblur != object->use_deform_mblur)
 	{
 		object->use_motion = use_mblur;
 		object->use_deform_mblur = use_deform_mblur;
-		scene->object_manager->tag_update(scene);
-		object_updated = true;
 	}
 
 	/* Get the number of motion blur steps. */
 	uint mblur_steps = object_mblur_steps(b_ob);
-	
-	/* Force update if necessary. */
+
+	/* We do not need to update the viewport. */
 	if (mblur_steps != object->mblur_steps)
 	{
 		object->mblur_steps = object->use_motion ? mblur_steps : 1;
-		scene->object_manager->tag_update(scene);
-		object_updated = true;
 
 		/* Get the new export times. */
 




More information about the Bf-blender-cvs mailing list