[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58136] branches/soc-2013-cycles_mblur/ intern/cycles/blender/blender_object.cpp: Added syncing of object-> use_deform_mblur and object->mblur_steps to the

[Gavin Howard]

Revision: 58136
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58136
Author:   gdh
Date:     2013-07-10 02:12:51 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
Added syncing of object->use_deform_mblur and object->mblur_steps to the 
blender_object.cpp file. These two fields were the fields I added in 
r58055.

IMPORTANT: They way I understand it, the syncing code works mostly in 
Rendered View mode, so I tested it by enabling motion blur as well as 
changing the number of export steps. The render did restart. That's what 
I expected if I understand the syncing code correctly. In other words, I 
DON'T KNOW IF THE CODE IN THIS COMMIT IS CORRECT! Please review it and 
make sure it does what it is support to do.

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

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-10 02:05:16 UTC (rev 58135)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp	2013-07-10 02:12:51 UTC (rev 58136)
@@ -282,6 +282,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. */
+	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) {
+		object->use_deform_mblur = use_deform_mblur;
+		object->mblur_steps = mblur_steps;
+		scene->object_manager->tag_update(scene);
+		object_updated = true;
+	}
+	
 	bool use_holdout = (layer_flag & render_layer.holdout_layer) != 0;
 	
 	/* mesh sync */