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

[Antonio Vazquez]

Commit: 3064b8d71774fdd460b3807368d3c2f92d752146
Author: Antonio Vazquez
Date:   Fri Jul 3 13:56:02 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB3064b8d71774fdd460b3807368d3c2f92d752146

Merge branch 'master' into greasepencil-edit-curve

 Conflicts:
	source/blender/blenkernel/intern/gpencil.c
	source/blender/blenkernel/intern/gpencil_geom.c
	source/blender/blenkernel/intern/gpencil_modifier.c

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



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

diff --cc source/blender/blenkernel/intern/gpencil.c
index 2d76d4b3da3,6a9511d8275..9df10ca6dab
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@@ -661,19 -680,12 +712,24 @@@ void BKE_gpencil_stroke_weights_duplica
    BKE_defvert_array_copy(gps_dst->dvert, gps_src->dvert, gps_src->totpoints);
  }
  
 +/* Make a copy of a given gpencil stroke editcurve */
 +bGPDcurve *BKE_gpencil_stroke_curve_duplicate(bGPDcurve *gpc_src)
 +{
 +  bGPDcurve *gpc_dst = MEM_dupallocN(gpc_src);
 +
 +  if (gpc_src->curve_points != NULL) {
 +    gpc_dst->curve_points = MEM_dupallocN(gpc_src->curve_points);
 +  }
 +
 +  return gpc_dst;
 +}
 +
- /* Make a copy of a given gpencil stroke */
+ /**
+  * Make a copy of a given gpencil stroke.
+  * \param gps_src: Source grease pencil strokeyes
+  * \param dup_points: Duplicate points data
+  * \return Pointer to new stroke
+  */
  bGPDstroke *BKE_gpencil_stroke_duplicate(bGPDstroke *gps_src, const bool dup_points)
  {
    bGPDstroke *gps_dst = NULL;
@@@ -1869,8 -2063,15 +2127,17 @@@ void BKE_gpencil_palette_ensure(Main *b
    }
  }
  
+ /**
+  * Create grease pencil strokes from image
+  * \param sima: Image
++ * \param gpd: Grease pencil data-block
+  * \param gpf: Grease pencil frame
+  * \param size: Size
+  * \param mask: Mask
+  * \return  True if done
+  */
 -bool BKE_gpencil_from_image(SpaceImage *sima, bGPDframe *gpf, const float size, const bool mask)
 +bool BKE_gpencil_from_image(
 +    SpaceImage *sima, bGPdata *gpd, bGPDframe *gpf, const float size, const bool mask)
  {
    Image *image = sima->image;
    bool done = false;
diff --cc source/blender/blenkernel/intern/gpencil_geom.c
index ad310d700bd,49940c2d466..61a60a0188a
--- a/source/blender/blenkernel/intern/gpencil_geom.c
+++ b/source/blender/blenkernel/intern/gpencil_geom.c
@@@ -618,17 -616,16 +620,18 @@@ bool BKE_gpencil_stroke_trim_points(bGP
  
    return true;
  }
+ 
  /**
   * Split stroke.
-  * \param gpd Grease pencil data-block
-  * \param gpf Grease pencil frame
-  * \param gps Grease pencil original stroke
-  * \param before_index Position of the point to split
-  * \param remaining_gps Secondary stroke after split.
++ * \param gpd: Grease pencil data-block
+  * \param gpf: Grease pencil frame
+  * \param gps: Grease pencil original stroke
+  * \param before_index: Position of the point to split
+  * \param remaining_gps: Secondary stroke after split.
   * \return True if the split was done
   */
 -bool BKE_gpencil_stroke_split(bGPDframe *gpf,
 +bool BKE_gpencil_stroke_split(bGPdata *gpd,
 +                              bGPDframe *gpf,
                                bGPDstroke *gps,
                                const int before_index,
                                bGPDstroke **remaining_gps)
@@@ -1267,10 -1264,9 +1270,10 @@@ void BKE_gpencil_stroke_uv_update(bGPDs
  
  /**
   * Recalc all internal geometry data for the stroke
-  * \param gpd Grease pencil data-block
-  * \param gps Grease pencil stroke
++ * \param gpd: Grease pencil data-block
+  * \param gps: Grease pencil stroke
   */
 -void BKE_gpencil_stroke_geometry_update(bGPDstroke *gps)
 +void BKE_gpencil_stroke_geometry_update(bGPdata *UNUSED(gpd), bGPDstroke *gps)
  {
    if (gps == NULL) {
      return;
@@@ -1321,10 -1316,10 +1330,10 @@@ float BKE_gpencil_stroke_length(const b
  }
  
  /**
-  * Trim stroke to the first intersection or loop
+  * Trim stroke to the first intersection or loop.
   * \param gps: Stroke data
   */
 -bool BKE_gpencil_stroke_trim(bGPDstroke *gps)
 +bool BKE_gpencil_stroke_trim(bGPdata *gpd, bGPDstroke *gps)
  {
    if (gps->totpoints < 4) {
      return false;
@@@ -1505,8 -1500,14 +1514,15 @@@ bool BKE_gpencil_stroke_close(bGPDstrok
  
    return true;
  }
- /* Dissolve points in stroke */
+ 
+ /**
+  * Dissolve points in stroke.
++ * \param gpd: Grease pencil data-block
+  * \param gpf: Grease pencil frame
+  * \param gps: Grease pencil stroke
+  * \param tag: Type of tag for point
+  */
 -void BKE_gpencil_dissolve_points(bGPDframe *gpf, bGPDstroke *gps, const short tag)
 +void BKE_gpencil_dissolve_points(bGPdata *gpd, bGPDframe *gpf, bGPDstroke *gps, const short tag)
  {
    bGPDspoint *pt;
    MDeformVert *dvert = NULL;