merge Collada changtes from master
authorGaia Clary <gaia.clary@machinimatrix.org>
Tue, 27 Feb 2018 16:53:53 +0000 (17:53 +0100)
committerGaia Clary <gaia.clary@machinimatrix.org>
Tue, 27 Feb 2018 16:53:53 +0000 (17:53 +0100)
1  2 
source/blender/collada/AnimationExporter.cpp
source/blender/collada/AnimationExporter.h
source/blender/collada/AnimationImporter.cpp
source/blender/editors/io/io_collada.c

index 684575bfc08cbb2e4269963af6d2138e01c66ab2,97d3b6b29b89f3e3c52070b47b9fa43aa4104965..1196b3dfbe8599370e091cc1c0f265d7103710c4
@@@ -214,15 -213,11 +214,11 @@@ void AnimationExporter::export_sampled_
  
        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);
 +              bc_update_scene(eval_ctx, 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++)
@@@ -251,8 -246,7 +247,7 @@@ void AnimationExporter::export_sampled_
                float fsize[3];
                float feul[3];
  
 -              bc_update_scene(scene, *ctime);
 +              bc_update_scene(eval_ctx, scene, *ctime);
                BKE_object_matrix_local_get(ob, fmat);
                mat4_decompose(floc, fquat, fsize, fmat);
                quat_to_eul(feul, fquat);