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

[Antonio Vazquez]

Commit: 808ee09081f12f1f0345f81ab5be8861ad087331
Author: Antonio Vazquez
Date:   Fri Jul 3 11:22:00 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB808ee09081f12f1f0345f81ab5be8861ad087331

Merge branch 'master' into greasepencil-edit-curve

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

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



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

diff --cc source/blender/blenkernel/intern/gpencil_geom.c
index 5eedfb00b75,3c24c30abd6..ad310d700bd
--- a/source/blender/blenkernel/intern/gpencil_geom.c
+++ b/source/blender/blenkernel/intern/gpencil_geom.c
@@@ -594,9 -615,15 +618,17 @@@ 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.
+  * \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)
@@@ -1201,8 -1260,11 +1265,12 @@@ void BKE_gpencil_stroke_uv_update(bGPDs
    }
  }
  
- /* Recalc the internal geometry caches for fill and uvs. */
+ /**
+  * Recalc all internal geometry data for the 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;