[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59227] branches/soc-2013-cycles_mblur/ intern/cycles/blender: Got rid of debugging output for export.

[Gavin Howard]

Revision: 59227
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59227
Author:   gdh
Date:     2013-08-18 04:44:02 +0000 (Sun, 18 Aug 2013)
Log Message:
-----------
Got rid of debugging output for export. It's not needed anymore.

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

Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp	2013-08-18 04:06:49 UTC (rev 59226)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp	2013-08-18 04:44:02 UTC (rev 59227)
@@ -263,7 +263,7 @@
 /* Object */
 
 Object *BlenderSync::sync_object(BL::Object b_parent, int persistent_id[OBJECT_PERSISTENT_ID_SIZE], BL::DupliObject b_dupli_ob,
-                                 Transform& tfm, uint layer_flag, float export_time, bool motion, bool hide_tris, bool display)
+                                 Transform& tfm, uint layer_flag, float export_time, bool motion, bool hide_tris)
 {
 	BL::Object b_ob = (b_dupli_ob ? b_dupli_ob.object() : b_parent);
 	
@@ -301,22 +301,6 @@
 			if(object->use_motion && object->use_deform_mblur &&
 			   object->export_times->find(export_time) != object->export_times->end()) {
 				sync_mesh_motion(b_ob, object->mesh);
-			
-				if (display) {
-					uint steps = object->mesh->mblur_steps;
-					uint size = object->mesh->verts.size();
-					Attribute *attr = object->mesh->attributes.find(ATTR_STD_DMOTION);
-					float3 *verts = attr->data_float3();
-					float3 item;
-					for(uint i = 0; i < steps - 1; ++i) {
-						cout << "\nStep " << (i + 1) << ":\n";
-						for(uint j = 0; j < size; ++j) {
-							item = verts[i * size+ j];
-							cout << "Vert " << (j + 1) << ": " << item[0] << "," << item[1] << "," << item[2] << endl;
-						}
-						cout << endl;
-					}
-				}
 			}
 		}
 
@@ -517,7 +501,7 @@
 
 /* Object Loop */
 
-void BlenderSync::sync_objects(BL::SpaceView3D b_v3d, std::set<float> *export_times, float export_time, bool motion, bool display)
+void BlenderSync::sync_objects(BL::SpaceView3D b_v3d, std::set<float> *export_times, float export_time, bool motion)
 {
 	/* layer data */
 	uint scene_layer = render_layer.scene_layer;
@@ -569,7 +553,7 @@
 
 							/* sync object and mesh or light data */
 							Object *object = sync_object(*b_ob, persistent_id.data, *b_dup, tfm,
-							                             ob_layer, export_time, motion, hide_tris, display);
+							                             ob_layer, export_time, motion, hide_tris);
 							
 							/* Make sure the object exists (I was getting null objects). */
 							if (object && !motion) {
@@ -605,7 +589,7 @@
 					/* object itself */
 					Transform tfm = get_transform(b_ob->matrix_world());
 					Object *object = sync_object(*b_ob, NULL, PointerRNA_NULL, tfm,
-					                             ob_layer, export_time, motion, hide_tris, display);
+					                             ob_layer, export_time, motion, hide_tris);
 					
 					/* Make sure the object exists (I was getting null objects). */
 					if (object && !motion) {
@@ -674,16 +658,9 @@
 		frame = static_cast<int>(*i);
 		subframe = *i - frame;
 		b_scene.frame_set(frame, subframe);
-		sync_objects(b_v3d, NULL, *i, true, index == (export_times->size() - 1));
+		sync_objects(b_v3d, NULL, *i, true);
 	}
 
-//	for(int motion = -1; motion <= 1; motion += 2) {
-//		b_scene.frame_set(frame + motion, 0.0f);
-
-//		/* mesh objects */
-//		sync_objects(b_v3d, motion);
-//	}
-
 	/* Get the current frame. */
 	frame = b_scene.frame_current();
 	b_scene.frame_set(frame, 0.0f);

Modified: branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.h	2013-08-18 04:06:49 UTC (rev 59226)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_sync.h	2013-08-18 04:44:02 UTC (rev 59227)
@@ -73,7 +73,7 @@
 	/* sync */
 	void sync_lamps(bool update_all);
 	void sync_materials(bool update_all);
-	void sync_objects(BL::SpaceView3D b_v3d, std::set<float> *export_times, float export_time = 0.0f, bool motion = false, bool display = false);
+	void sync_objects(BL::SpaceView3D b_v3d, std::set<float> *export_times, float export_time = 0.0f, bool motion = false);
 	void sync_motion(BL::SpaceView3D b_v3d, BL::Object b_override, std::set<float> *export_times);
 	void sync_film();
 	void sync_view();
@@ -85,7 +85,7 @@
 	Mesh *sync_mesh(BL::Object b_ob, bool object_updated, bool hide_tris, uint mblur_steps);
 	void sync_curves(Mesh *mesh, BL::Mesh b_mesh, BL::Object b_ob, bool object_updated);
 	Object *sync_object(BL::Object b_parent, int persistent_id[OBJECT_PERSISTENT_ID_SIZE], BL::DupliObject b_dupli_ob,
-	                                 Transform& tfm, uint layer_flag, float export_time, bool motion, bool hide_tris, bool display);
+	                                 Transform& tfm, uint layer_flag, float export_time, bool motion, bool hide_tris);
 	void sync_light(BL::Object b_parent, int persistent_id[OBJECT_PERSISTENT_ID_SIZE], BL::Object b_ob, Transform& tfm);
 	void sync_background_light();
 	void sync_mesh_motion(BL::Object b_ob, Mesh *mesh);