Merge branch 'master' into blender2.8

diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp
index a1497a0ab44e8da0861883d0d56e44a69e3ceebc..3e57dafed19a31a5b7c24381d0677fa2dfc8a314 100644 (file)
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -219,6 +219,7 @@ void AnimationExporter::export_sampled_matrix_animation(Object *ob, std::vector<
 
                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)
@@ -284,8 +285,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);
 }
@@ -1261,10 +1262,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) {