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

[Antonio Vazquez]

Commit: f0ed70eb12b81ed3fc97d7eeb88c2d7131aacb81
Author: Antonio Vazquez
Date:   Mon Aug 3 12:35:18 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rBf0ed70eb12b81ed3fc97d7eeb88c2d7131aacb81

Merge branch 'master' into greasepencil-edit-curve

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



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

diff --cc source/blender/blenkernel/BKE_gpencil_geom.h
index 295fdef5966,c97461fb0c8..36606a51440
--- a/source/blender/blenkernel/BKE_gpencil_geom.h
+++ b/source/blender/blenkernel/BKE_gpencil_geom.h
@@@ -79,10 -73,10 +79,10 @@@ void BKE_gpencil_stroke_2d_flat_ref(con
                                      const float scale,
                                      int *r_direction);
  void BKE_gpencil_stroke_fill_triangulate(struct bGPDstroke *gps);
 -void BKE_gpencil_stroke_geometry_update(struct bGPDstroke *gps);
 +void BKE_gpencil_stroke_geometry_update(struct bGPdata *gpd, struct bGPDstroke *gps);
  void BKE_gpencil_stroke_uv_update(struct bGPDstroke *gps);
  
- void BKE_gpencil_transform(struct bGPdata *gpd, float mat[4][4]);
+ void BKE_gpencil_transform(struct bGPdata *gpd, const float mat[4][4]);
  
  typedef struct GPencilPointCoordinates {
    /* This is used when doing "move only origin" in object_data_transform.c.