Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 2 Feb 2018 03:15:29 +0000 (14:15 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 2 Feb 2018 03:15:29 +0000 (14:15 +1100)
1  2 
build_files/cmake/platform/platform_win32.cmake
source/blender/collada/DocumentExporter.cpp
source/blender/editors/interface/view2d.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/sculpt_paint/paint_vertex_proj.c
source/creator/CMakeLists.txt

index ce0c52cdcd1bf94e6835f55a812f186da8b06b87,3c938f6b6cb7a599ddf027f11ba4cf86a300763e..6e84c3baccb4a3f8e6921c4cafe9594f7ea003a0
@@@ -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>
index bf2da2845919e5d029225f90c0c0c55c86bfa387,c62ed74eaff160d4ba5a9f38390f77c731ca68ae..8a172f866243e9137a2d7c3a0a02582e8e72c4ae
@@@ -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;
Simple merge