Commit: 148e2ace61a75b6abcefccf97f878c0a80d1f6e4
Author: Gaia Clary
Date: Tue Feb 27 16:55:18 2018 +0100
Branches: master
https://developer.blender.org/rB148e2ace61a75b6abcefccf97f878c0a80d1f6e4
Collada: removed unnecessary dup[licate matrix conversion in matrix data
exporter
===================================================================
M source/blender/collada/AnimationExporter.cpp
===================================================================
diff --git a/source/blender/collada/AnimationExporter.cpp
b/source/blender/collada/AnimationExporter.cpp
index 3eefe84b214..cc9e7d2b088 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -213,19 +213,15 @@ void
AnimationExporter::export_sampled_matrix_animation(Object *ob, std::vector<
for (std::vector<float>::iterator ctime = ctimes.begin(); ctime !=
ctimes.end(); ++ctime) {
float fmat[4][4];
- float outmat[4][4];
bc_update_scene(scene, *ctime);
BKE_object_matrix_local_get(ob, fmat);
-
- converter.mat4_to_dae(outmat, fmat);
-
if (this->export_settings->limit_precision)
- bc_sanitize_mat(outmat, 6);
+ bc_sanitize_mat(fmat, 6);
for (int i = 0; i < 4; i++)
for (int j = 0; j < 4; j++)
- values.push_back(outmat[j][i]);
+ values.push_back(fmat[i][j]);
}
std::string ob_name = id_name(ob);
@@ -251,7 +247,6 @@ void
AnimationExporter::export_sampled_transrotloc_animation(Object *ob, std::ve
float feul[3];
bc_update_scene(scene, *ctime);
-
BKE_object_matrix_local_get(ob, fmat);
mat4_decompose(floc, fquat, fsize, fmat);
quat_to_eul(feul, fquat);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
