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

[Antonio Vazquez]

Commit: e6ed400b9a9769cc53d57dd898bd192eb0e542db
Author: Antonio Vazquez
Date:   Mon Jul 6 20:27:26 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rBe6ed400b9a9769cc53d57dd898bd192eb0e542db

Merge branch 'master' into greasepencil-edit-curve

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



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

diff --cc source/blender/blenkernel/intern/gpencil.c
index 761ab719255,b94b71841dc..27456cf6815
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@@ -712,23 -680,11 +712,23 @@@ 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.
-  * \param gps_src: Source grease pencil strokeyes
-  * \param dup_points: Duplicate points data
-  * \return Pointer to new stroke
+  * Make a copy of a given grease-pencil stroke.
+  * \param gps_src: Source grease pencil strokes.
+  * \param dup_points: Duplicate points data.
+  * \return Pointer to new stroke.
   */
  bGPDstroke *BKE_gpencil_stroke_duplicate(bGPDstroke *gps_src, const bool dup_points)
  {