[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41574] trunk/blender/source/blender: Removed old "bsystem_time()" function, which by now is just a

[Domino Marama]

On Sun, 2011-11-06 at 06:08 +0000, Joshua Leung wrote:
> Revision: 41574
>           http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41574
> Author:   aligorith
> Date:     2011-11-06 06:08:18 +0000 (Sun, 06 Nov 2011)
> Log Message:
> -----------
> Removed old "bsystem_time()" function, which by now is just a
> duplicate of BKE_curframe() which just takes two extra args.

You missed a few uses of this function in the collada code.

Index: source/blender/collada/AnimationExporter.cpp
===================================================================
--- source/blender/collada/AnimationExporter.cpp	(revision 41576)
+++ source/blender/collada/AnimationExporter.cpp	(working copy)
@@ -23,6 +23,7 @@
 #include "GeometryExporter.h"
 #include "AnimationExporter.h"
 #include "MaterialExporter.h"
+#include "BKE_scene.h"
 
 template<class Functor>
 void forEachObjectInScene(Scene *sce, Functor &f)
@@ -759,7 +760,7 @@
 	for (it = frames.begin(); it != frames.end(); it++) {
 		float mat[4][4], ipar[4][4];
 
-		float ctime = bsystem_time(scene, ob_arm, *it, 0.0f);
+		float ctime = BKE_curframe(scene);
 
 		BKE_animsys_evaluate_animdata(scene , &ob_arm->id, ob_arm->adt,
ctime, ADT_RECALC_ANIM);
 		where_is_pose_bone(scene, ob_arm, pchan, ctime, 1);
@@ -1265,7 +1266,7 @@
 	for (it = frames.begin(); it != frames.end(); it++) {
 		float mat[4][4], ipar[4][4];
 
-		float ctime = bsystem_time(scene, ob_arm, *it, 0.0f);
+		float ctime = BKE_curframe(scene);
 
 
 		BKE_animsys_evaluate_animdata(scene , &ob_arm->id, ob_arm->adt,
ctime, ADT_RECALC_ANIM);