[Bf-blender-cvs] [c3eb22e2ab0] blender2.8: Merge branch 'master' into blender2.8

Campbell Barton noreply at git.blender.org
Fri Feb 2 04:13:45 CET 2018


Commit: c3eb22e2ab0f4f96d64d1de7969966efd5d45066
Author: Campbell Barton
Date:   Fri Feb 2 14:15:29 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBc3eb22e2ab0f4f96d64d1de7969966efd5d45066

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/collada/DocumentExporter.cpp
index ce0c52cdcd1,3c938f6b6cb..6e84c3baccb
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/collada/DocumentExporter.cpp
@@@ -302,12 -304,12 +302,12 @@@ int DocumentExporter::exportCurrentScen
  
  	// <library_animations>
  	AnimationExporter ae(writer, this->export_settings);
 -	bool has_animations = ae.exportAnimations(sce);
 +	bool has_animations = ae.exportAnimations(eval_ctx, sce);
  
+ #if 0
+ 	/* The following code seems to be an obsolete workaround
+ 	Comment out until it proofs correct that we no longer need it.
+ 	*/
  	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>
diff --cc source/blender/editors/object/object_vgroup.c
index bf2da284591,c62ed74eaff..8a172f86624
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@@ -1275,8 -1284,9 +1286,9 @@@ static DerivedMesh *dm_deform_recalc(Ev
   * norm and d are the plane's properties for the equation: ax + by + cz + d = 0
   * coord is a point on the plane
   */
- static void moveCloserToDistanceFromPlane(EvaluationContext *eval_ctx, Scene *scene, Object *ob, Mesh *me, int index, float norm[3],
-                                           float coord[3], float d, float distToBe, float strength, float cp)
+ static void moveCloserToDistanceFromPlane(
 -        Scene *scene, Object *ob, Mesh *me, int index, float norm[3],
++        EvaluationContext *eval_ctx, Scene *scene, Object *ob, Mesh *me, int index, float norm[3],
+         float coord[3], float d, float distToBe, float strength, float cp)
  {
  	DerivedMesh *dm;
  	MDeformWeight *dw;



More information about the Bf-blender-cvs mailing list