[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58307] branches/soc-2013-cycles_mblur/ intern/cycles/blender/blender_object.cpp: Changed sync_object so the viewport would update when motion is enabled

[Gavin Howard]

Revision: 58307
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58307
Author:   gdh
Date:     2013-07-16 02:44:52 +0000 (Tue, 16 Jul 2013)
Log Message:
-----------
Changed sync_object so the viewport would update when motion is enabled 
or disabled for the object.

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-16 02:27:35 UTC (rev 58306)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp	2013-07-16 02:44:52 UTC (rev 58307)
@@ -296,12 +296,18 @@
 	if(object_map.sync(&object, b_ob, b_parent, key))
 		object_updated = true;
 	
-	/* Get the number of export steps and whether the object will use deform blur. */
+	/* Get whether motion is enabled, the number of export steps,
+	 * 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);
 	uint mblur_steps = object_mblur_steps(b_ob);
 	
 	/* Force update if necessary. */
-	if (use_deform_mblur != object->use_deform_mblur || mblur_steps != object->mblur_steps) {
+	if (use_mblur != object->use_motion ||
+		mblur_steps != object->mblur_steps ||
+		use_deform_mblur != object->use_deform_mblur)
+	{
+		object->use_motion = use_mblur;
 		object->use_deform_mblur = use_deform_mblur;
 		object->mblur_steps = mblur_steps;
 		scene->object_manager->tag_update(scene);