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

[Antonio Vazquez]

Commit: fb838592789b3589fd369f7b0b2750d4107e2871
Author: Antonio Vazquez
Date:   Tue Jan 7 14:14:51 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBfb838592789b3589fd369f7b0b2750d4107e2871

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/editors/gpencil/gpencil_paint.c
index 023cc32227d,6a91417e7f3..5362390daa6
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@@ -980,10 -1171,9 +980,10 @@@ static void gp_stroke_newfrombuffer(tGP
    const int subdivide = brush->gpencil_settings->draw_subdivide;
  
    gps->points = MEM_callocN(sizeof(bGPDspoint) * gps->totpoints, "gp_stroke_points");
 +  gps->dvert = NULL;
  
    /* initialize triangle memory to dummy data */
-   gps->triangles = MEM_callocN(sizeof(bGPDtriangle), "GP Stroke triangulation");
+   gps->triangles = NULL;
    gps->flag |= GP_STROKE_RECALC_GEOMETRY;
    gps->tot_triangles = 0;
    /* drawing batch cache is dirty now */