Commit: e99ffb8dcc0f41841efbd109450a342f931d956c Author: Falk David Date: Sat Aug 8 16:43:25 2020 +0200 Branches: soc-2020-greasepencil-curve https://developer.blender.org/rBe99ffb8dcc0f41841efbd109450a342f931d956c
Merge branch 'greasepencil-edit-curve' into soc-2020-greasepencil-curve =================================================================== =================================================================== diff --cc source/blender/blenkernel/intern/gpencil_curve.c index 61951cb9ff3,d53e712326b..633cb755577 --- a/source/blender/blenkernel/intern/gpencil_curve.c +++ b/source/blender/blenkernel/intern/gpencil_curve.c @@@ -55,12 -55,8 +55,12 @@@ #define COORD_FITTING_INFLUENCE 20.0f +/* -------------------------------------------------------------------- */ +/** \name Convert to curve object + * \{ */ + /* 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]; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs