blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

GPencil: Clean material list when convert a curve 

Now the list of materials is cleanup and any duplicated material is removed.
This commit is contained in:
Antonio Vazquez 2020-08-12 19:46:15 +02:00
parent cd49c7b5ea
commit e188a798c6
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/blenkernel/intern/gpencil_curve.c
View File

@ -447,7 +447,6 @@ static void gpencil_convert_spline(Main *bmain,
}
}
/* Cyclic curve, close stroke. */
// if ((cyclic) && (!do_stroke)) {
if (cyclic) {
BKE_gpencil_stroke_close(gps);
}
@ -523,8 +522,29 @@ void BKE_gpencil_convert_curve(Main *bmain,
bmain, ob_gp, ob_cu, gpencil_lines, only_stroke, scale_thickness, sample, gpf, nu);
}
/* Merge any similar material. */
int removed = 0;
BKE_gpencil_merge_materials(ob_gp, 0.001f, 0.001f, 0.001f, &removed);
/* Remove any unused slot. */
int actcol = ob_gp->actcol;
for (int slot = 1; slot <= ob_gp->totcol; slot++) {
while (slot <= ob_gp->totcol && !BKE_object_material_slot_used(ob_gp->data, slot)) {
ob_gp->actcol = slot;
BKE_object_material_slot_remove(bmain, ob_gp);
if (actcol >= slot) {
actcol--;
}
}
}
ob_gp->actcol = actcol;
/* Tag for recalculation */
DEG_id_tag_update(&gpd->id, ID_RECALC_GEOMETRY | ID_RECALC_COPY_ON_WRITE);
DEG_id_tag_update(&ob_gp->id, ID_RECALC_GEOMETRY);
}
/** \} */