[Bf-blender-cvs] [843eccb2005] greasepencil-edit-curve: Merge branch 'master' into greasepencil-edit-curve

[Antonio Vazquez]

Commit: 843eccb200597b8128a04c623456a2f9f4d9ee34
Author: Antonio Vazquez
Date:   Sat Aug 8 12:49:41 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB843eccb200597b8128a04c623456a2f9f4d9ee34

Merge branch 'master' into greasepencil-edit-curve

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



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

diff --cc source/blender/blenkernel/intern/gpencil_curve.c
index f7417a27402,e64369d74cb..d53e712326b
--- a/source/blender/blenkernel/intern/gpencil_curve.c
+++ b/source/blender/blenkernel/intern/gpencil_curve.c
@@@ -49,14 -47,10 +49,14 @@@
  #include "BKE_material.h"
  #include "BKE_object.h"
  
 +#include "curve_fit_nd.h"
 +
  #include "DEG_depsgraph_query.h"
  
 +#define COORD_FITTING_INFLUENCE 20.0f
 +
  /* Helper: Check materials with same color. */
- static int gpencil_check_same_material_color(Object *ob_gp, float color[4], Material **r_mat)
+ static int gpencil_check_same_material_color(Object *ob_gp, const float color[4], Material **r_mat)
  {
    Material *ma = NULL;
    float color_cu[4];