Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T75283: GPencil Stroke created by Merge points can't have fill material

Browse Source
This commit is contained in:
Antonio Vazquez
2020-04-01 19:35:35 +02:00
parent c4374bc919
commit a9963669f9
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/gpencil/gpencil_merge.c
View File

@@ -132,18 +132,8 @@ static bGPDstroke *gpencil_prepare_stroke(bContext *C, wmOperator *op, int totpo
bGPDframe *gpf = BKE_gpencil_layer_frame_get(gpl, CFRA, add_frame_mode); bGPDframe *gpf = BKE_gpencil_layer_frame_get(gpl, CFRA, add_frame_mode);
/* stroke */ /* stroke */
bGPDstroke *gps = MEM_callocN(sizeof(bGPDstroke), "gp_stroke"); bGPDstroke *gps = BKE_gpencil_stroke_new(ob->actcol - 1, totpoints, brush->size);
gps->totpoints = totpoints;
gps->inittime = 0.0f;
gps->thickness = brush->size;
gps->hardeness = brush->gpencil_settings->hardeness;
copy_v2_v2(gps->aspect_ratio, brush->gpencil_settings->aspect_ratio);
gps->flag |= GP_STROKE_SELECT; gps->flag |= GP_STROKE_SELECT;
gps->flag |= GP_STROKE_3DSPACE;
gps->mat_nr = ob->actcol - 1;
/* allocate memory for points */
gps->points = MEM_callocN(sizeof(bGPDspoint) * totpoints, "gp_stroke_points");
if (cyclic) { if (cyclic) {
gps->flag |= GP_STROKE_CYCLIC; gps->flag |= GP_STROKE_CYCLIC;
@@ -529,6 +519,8 @@ static int gp_stroke_merge_exec(bContext *C, wmOperator *op)
gpencil_dissolve_points(C); gpencil_dissolve_points(C);
} }
BKE_gpencil_stroke_geometry_update(gps);
/* free memory */ /* free memory */
MEM_SAFE_FREE(original_array); MEM_SAFE_FREE(original_array);
MEM_SAFE_FREE(sorted_array); MEM_SAFE_FREE(sorted_array);