[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58639] branches/soc-2013-cycles_mblur/ intern/cycles: More work toward getting export to work.

[Gavin Howard]

Revision: 58639
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58639
Author:   gdh
Date:     2013-07-27 00:47:41 +0000 (Sat, 27 Jul 2013)
Log Message:
-----------
More work toward getting export to work.

This commit has the shell of the for loops I will need in sync_motion(). 
There are various other improvments as well.

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/render/attribute.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-26 23:18:26 UTC (rev 58638)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp	2013-07-27 00:47:41 UTC (rev 58639)
@@ -364,6 +364,14 @@
 
 	/* mesh sync */
 	object->mesh = sync_mesh(b_ob, object_updated, hide_tris, mblur_steps);
+	
+	/* We may have to update deformation motion blur. */
+	if (object->use_motion && object->use_deform_mblur) {
+		
+		/* Delete the VERTEX_STEPS attribute and re-add it. */
+		object->mesh->attributes.remove(ATTR_STD_DMOTION);
+		object->mesh->attributes.add(ATTR_STD_DMOTION);
+	}
 
 	/* sspecial case not tracked by object update flags */
 	if(use_holdout != object->use_holdout) {
@@ -627,9 +635,18 @@
 	/* go back and forth one frame */
 	int frame = b_scene.frame_current();
 
+	BL::Scene b_sce = b_scene;
+	BL::Scene::objects_iterator b_ob;
 	set<float>::iterator i;
+	bool cancel = false;
 	for(i = export_times->begin(); i != export_times->end(); i++) {
-		
+		for(; b_sce && !cancel; b_sce = b_sce.background_set()) {
+			for(b_sce.objects.begin(b_ob); b_ob != b_sce.objects.end() && !cancel; ++b_ob) {
+				
+				
+				cancel = progress.get_cancel();
+			}
+		}
 	}
 
 //	for(int motion = -1; motion <= 1; motion += 2) {

Modified: branches/soc-2013-cycles_mblur/intern/cycles/render/attribute.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/render/attribute.cpp	2013-07-26 23:18:26 UTC (rev 58638)
+++ branches/soc-2013-cycles_mblur/intern/cycles/render/attribute.cpp	2013-07-27 00:47:41 UTC (rev 58639)
@@ -91,7 +91,7 @@
 			size = numverts;
 			break;
 		case ATTR_ELEMENT_VERTEX_STEPS:
-			size = numverts * numsteps;
+			size = numverts * (numsteps - 1);
 			break;
 		case ATTR_ELEMENT_FACE:
 			size = numtris;