diff options
| author | Joshua Leung <aligorith@gmail.com> | 2011-11-06 16:12:14 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2011-11-06 16:12:14 +0400 |
| commit | e03fdd81122edba048882f07bfef09a1764e1682 (patch) | |
| tree | fad83ef84c22e62a65d844e1a2249cb0214e96e4 /source/blender/collada | |
| parent | d738c8df1f9b608438162f2f9c24c4fd29dda3f3 (diff) | |
Second attempt at getting rid of bsystem_time()
Hopefully this fixes Collada. Can't really compile that to check
here...
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/AnimationExporter.cpp | 4 | ||||
| -rw-r--r-- | source/blender/collada/AnimationExporter.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp index b115a96cfa1..7bd70e9f289 100644 --- a/source/blender/collada/AnimationExporter.cpp +++ b/source/blender/collada/AnimationExporter.cpp @@ -759,7 +759,7 @@ std::string AnimationExporter::create_4x4_source(std::vector<float> &frames , Ob 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_frame_to_ctime(scene, *it); 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 +1265,7 @@ void AnimationExporter::sample_animation(float *v, std::vector<float> &frames, i 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_frame_to_ctime(scene, *it); BKE_animsys_evaluate_animdata(scene , &ob_arm->id, ob_arm->adt, ctime, ADT_RECALC_ANIM); diff --git a/source/blender/collada/AnimationExporter.h b/source/blender/collada/AnimationExporter.h index 7f6c99b108f..c3a5c7a5383 100644 --- a/source/blender/collada/AnimationExporter.h +++ b/source/blender/collada/AnimationExporter.h @@ -38,6 +38,7 @@ extern "C" #include "BKE_DerivedMesh.h" #include "BKE_fcurve.h" #include "BKE_animsys.h" +#include "BKE_scene.h" #ifdef NAN_BUILDINFO extern char build_rev[]; #endif |