[Bf-blender-cvs] [1a65168c420] blender2.8: merge Collada changtes from master

[Gaia Clary]

Commit: 1a65168c4202a76cfacaafb6c1175b56d82d7123
Author: Gaia Clary
Date:   Tue Feb 27 17:53:53 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB1a65168c4202a76cfacaafb6c1175b56d82d7123

merge Collada changtes from master

===================================================================



===================================================================

diff --cc source/blender/collada/AnimationExporter.cpp
index 684575bfc08,97d3b6b29b8..1196b3dfbe8
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@@ -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);