[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58644] branches/soc-2013-cycles_mblur/ intern/cycles/blender/blender_object.cpp: Added code to extract the frame and subframe from the export time.
Gavin Howard
gavin.d.howard at gmail.com
Sat Jul 27 05:00:11 CEST 2013
Revision: 58644
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58644
Author: gdh
Date: 2013-07-27 03:00:06 +0000 (Sat, 27 Jul 2013)
Log Message:
-----------
Added code to extract the frame and subframe from the export time.
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-27 01:15:30 UTC (rev 58643)
+++ branches/soc-2013-cycles_mblur/intern/cycles/blender/blender_object.cpp 2013-07-27 03:00:06 UTC (rev 58644)
@@ -16,6 +16,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#include <iostream>
#include "camera.h"
#include "integrator.h"
#include "graph.h"
@@ -634,14 +635,17 @@
sync_camera_motion(b_cam, 1);
}
- /* 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;
+ int frame;
+ float subframe;
for(i = export_times->begin(); i != export_times->end(); i++) {
+
+ /*Get the frame and subframe. */
+ frame = static_cast<int>(*i);
+ subframe = *i - frame;
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) {
@@ -658,6 +662,8 @@
// sync_objects(b_v3d, motion);
// }
+ /* Get the current frame. */
+ frame = b_scene.frame_current();
b_scene.frame_set(frame, 0.0f);
/* tag camera for motion update */
More information about the Bf-blender-cvs
mailing list