[Bf-blender-cvs] [8ac8cb9ce1f] greasepencil-object: GP: fix error after merge

[Antonioya]

Commit: 8ac8cb9ce1f51b369808255dccfee429b2c5d808
Author: Antonioya
Date:   Fri Dec 28 10:48:45 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB8ac8cb9ce1f51b369808255dccfee429b2c5d808

GP: fix error after merge

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

M       source/blender/editors/gpencil/gpencil_merge.c

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

diff --git a/source/blender/editors/gpencil/gpencil_merge.c 
b/source/blender/editors/gpencil/gpencil_merge.c
index a628ed9dbf1..02f71b19398 100644
--- a/source/blender/editors/gpencil/gpencil_merge.c
+++ b/source/blender/editors/gpencil/gpencil_merge.c
@@ -135,7 +135,6 @@ static bGPDstroke *gpencil_prepare_stroke(bContext *C, 
wmOperator *op, int totpo
        gps->totpoints = totpoints;
        gps->inittime = 0.0f;
        gps->thickness = brush->size;
-       gps->flag |= GP_STROKE_RECALC_CACHES;
        gps->flag |= GP_STROKE_SELECT;
        gps->flag |= GP_STROKE_3DSPACE;
        gps->mat_nr = ob->actcol - 1;
@@ -145,7 +144,7 @@ static bGPDstroke *gpencil_prepare_stroke(bContext *C, 
wmOperator *op, int totpo
        /* initialize triangle memory to dummy data */
        gps->tot_triangles = 0;
        gps->triangles = NULL;
-       gps->flag |= GP_STROKE_RECALC_CACHES;
+       gps->flag |= GP_STROKE_RECALC_GEOMETRY;
 
        if (cyclic) {
                gps->flag |= GP_STROKE_CYCLIC;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs