[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58458] branches/soc-2013-cycles_mblur/ intern/cycles: Added a field to the object class.

[Gavin Howard]

Revision: 58458
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58458
Author:   gdh
Date:     2013-07-20 18:52:28 +0000 (Sat, 20 Jul 2013)
Log Message:
-----------
Added a field to the object class. This commit starts my preparation for 
the fairly long process of getting multi-step, per-vertex export done.

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp
    branches/soc-2013-cycles_mblur/intern/cycles/render/object.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-07-20 18:20:54 UTC (rev 58457)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp	2013-07-20 18:52:28 UTC (rev 58458)
@@ -471,6 +471,8 @@
 
 	bool cancel = false;
 
+	std::set<float> export_times;
+
 	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) {
 			bool hide = (render_layer.use_viewport_visibility)? b_ob->hide(): b_ob->hide_render();

Modified: branches/soc-2013-cycles_mblur/intern/cycles/render/object.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/render/object.h	2013-07-20 18:20:54 UTC (rev 58457)
+++ branches/soc-2013-cycles_mblur/intern/cycles/render/object.h	2013-07-20 18:52:28 UTC (rev 58458)
@@ -56,6 +56,12 @@
 	float2 dupli_uv;
 
 	int particle_id;
+	
+	/*
+	 * This one is only used during syncing.
+	 * It should be set to NULL right afterward.
+	 */
+	std::set<float> *export_times;
 
 	Object();
 	~Object();