[Bf-blender-cvs] [b5f0e8e1a1c] master: Collada: removed unused variables. fixed incompatible format in console output (AnimationExporter.cpp)
Gaia Clary
noreply at git.blender.org
Mon Feb 26 23:37:41 CET 2018
Commit: b5f0e8e1a1c04db001a34090e288531717e0980b
Author: Gaia Clary
Date: Mon Feb 26 23:37:27 2018 +0100
Branches: master
https://developer.blender.org/rBb5f0e8e1a1c04db001a34090e288531717e0980b
Collada: removed unused variables. fixed incompatible format in console output (AnimationExporter.cpp)
===================================================================
M source/blender/collada/AnimationExporter.cpp
===================================================================
diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp
index 8c0733374a1..54da8b98138 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -218,6 +218,7 @@ void AnimationExporter::export_sampled_matrix_animation(Object *ob, std::vector<
bc_update_scene(scene, *ctime);
BKE_object_matrix_local_get(ob, fmat);
+
converter.mat4_to_dae(outmat, fmat);
if (this->export_settings->limit_precision)
@@ -283,8 +284,8 @@ void AnimationExporter::export_sampled_transrotloc_animation(Object *ob, std::ve
create_sampled_animation(1, ctimes, baked_curves[EULY], ob_name, "rotation", "Y", true);
create_sampled_animation(1, ctimes, baked_curves[EULZ], ob_name, "rotation", "Z", true);
- fprintf(stdout, "Animation Export: Baked %zd frames for %s (sampling rate: %d)\n",
- baked_curves[0].size(),
+ fprintf(stdout, "Animation Export: Baked %d frames for %s (sampling rate: %d)\n",
+ (int)baked_curves[0].size(),
ob->id.name,
this->export_settings->sampling_rate);
}
@@ -1260,10 +1261,6 @@ std::string AnimationExporter::create_4x4_source(std::vector<float> &ctimes, std
source.prepareToAppendValues();
- bPoseChannel *parchan = NULL;
- bPoseChannel *pchan = NULL;
-
-
std::vector<float>::iterator it;
for (it = values.begin(); it != values.end(); it+=16) {
More information about the Bf-blender-cvs
mailing list