[Bf-blender-cvs] [d503af9a617] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: d503af9a6173a4911277ed0043d17bc72aa2c77a
Author: Antonio Vazquez
Date:   Wed Mar 4 22:12:25 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBd503af9a6173a4911277ed0043d17bc72aa2c77a

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/editors/gpencil/gpencil_edit.c
index 642bb615340,1931f35922a..cb4458c68ee
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@@ -786,8 -671,13 +786,8 @@@ static void gp_duplicate_points(const b
          /* saves original layer name */
          BLI_strncpy(gpsd->runtime.tmp_layerinfo, layername, sizeof(gpsd->runtime.tmp_layerinfo));
  
 -        /* initialize triangle memory - will be calculated on next redraw */
 -        gpsd->triangles = NULL;
 -        gpsd->flag |= GP_STROKE_RECALC_GEOMETRY;
 -        gpsd->tot_triangles = 0;
 -
          /* now, make a new points array, and copy of the relevant parts */
-         gpsd->points = MEM_callocN(sizeof(bGPDspoint) * len, "gps stroke points copy");
+         gpsd->points = MEM_mallocN(sizeof(bGPDspoint) * len, "gps stroke points copy");
          memcpy(gpsd->points, gps->points + start_idx, sizeof(bGPDspoint) * len);
          gpsd->totpoints = len;