[Bf-blender-cvs] [3ceb3512f85] blender2.8: Merge remote-tracking branch 'origin/master' into blender2.8

[Dalai Felinto]

Commit: 3ceb3512f850028fe6843fdad37cb6271514b9b8
Author: Dalai Felinto
Date:   Wed Nov 8 18:35:31 2017 -0200
Branches: blender2.8
https://developer.blender.org/rB3ceb3512f850028fe6843fdad37cb6271514b9b8

Merge remote-tracking branch 'origin/master' into blender2.8

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



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

diff --cc source/blender/collada/DocumentExporter.cpp
index 88bc5c3c295,284a6da1a40..ce0c52cdcd1
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/collada/DocumentExporter.cpp
@@@ -285,13 -287,9 +285,9 @@@ int DocumentExporter::exportCurrentScen
  	// <library_geometries>
  	if (bc_has_object_type(export_set, OB_MESH)) {
  		GeometryExporter ge(writer, this->export_settings);
 -		ge.exportGeom(sce);
 +		ge.exportGeom(eval_ctx, sce);
  	}
  
- 	// <library_animations>
- 	AnimationExporter ae(writer, this->export_settings);
- 	bool has_animations = ae.exportAnimations(eval_ctx, sce);
- 
  	// <library_controllers>
  	ArmatureExporter arm_exporter(writer, this->export_settings);
  	ControllerExporter controller_exporter(writer, this->export_settings);
@@@ -307,6 -305,11 +303,11 @@@
  	/* The following code seems to be an obsolete workaround
  	   Comment out until it proofs correct that we no longer need it.
  	*/
+ 
+ 	// <library_animations>
+ 	AnimationExporter ae(writer, this->export_settings);
 -	bool has_animations = ae.exportAnimations(sce);
++	bool has_animations = ae.exportAnimations(eval_ctx, sce);
+ 
  	if (has_animations && this->export_settings->export_transformation_type == BC_TRANSFORMATION_TYPE_MATRIX) {
  		// channels adressing <matrix> objects is not (yet) supported
  		// So we force usage of <location>, <translation> and <scale>