forked from bartvdbraak/blender
Modifier: rename triangulate scanfill to ear-clip
This commit is contained in:
parent
77290fccd5
commit
08f5e3897c
@ -2499,7 +2499,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *main)
|
||||
}
|
||||
else {
|
||||
tmd->quad_method = MOD_TRIANGULATE_QUAD_FIXED;
|
||||
tmd->ngon_method = MOD_TRIANGULATE_NGON_SCANFILL;
|
||||
tmd->ngon_method = MOD_TRIANGULATE_NGON_EARCLIP;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1660,7 +1660,7 @@ static void ed_surf_delete_selected(Object *obedit)
|
||||
BPoint *bp, *bpn, *newbp;
|
||||
int a, b, newu, newv;
|
||||
|
||||
BLI_assert(obedit->type != OB_SURF);
|
||||
BLI_assert(obedit->type == OB_SURF);
|
||||
|
||||
nu = editnurb->first;
|
||||
while (nu) {
|
||||
|
@ -366,7 +366,7 @@ void ED_keymap_mesh(wmKeyConfig *keyconf)
|
||||
RNA_enum_set(kmi->ptr, "ngon_method", MOD_TRIANGULATE_NGON_BEAUTY);
|
||||
kmi = WM_keymap_add_item(keymap, "MESH_OT_quads_convert_to_tris", TKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
|
||||
RNA_enum_set(kmi->ptr, "quad_method", MOD_TRIANGULATE_QUAD_FIXED);
|
||||
RNA_enum_set(kmi->ptr, "ngon_method", MOD_TRIANGULATE_NGON_SCANFILL);
|
||||
RNA_enum_set(kmi->ptr, "ngon_method", MOD_TRIANGULATE_NGON_EARCLIP);
|
||||
|
||||
WM_keymap_add_item(keymap, "MESH_OT_tris_convert_to_quads", JKEY, KM_PRESS, KM_ALT, 0);
|
||||
|
||||
|
@ -4711,7 +4711,7 @@ static void SCULPT_OT_set_persistent_base(wmOperatorType *ot)
|
||||
static void sculpt_dynamic_topology_triangulate(BMesh *bm)
|
||||
{
|
||||
if (bm->totloop != bm->totface * 3) {
|
||||
BM_mesh_triangulate(bm, MOD_TRIANGULATE_QUAD_FIXED, MOD_TRIANGULATE_NGON_SCANFILL, false, NULL, NULL);
|
||||
BM_mesh_triangulate(bm, MOD_TRIANGULATE_QUAD_FIXED, MOD_TRIANGULATE_NGON_EARCLIP, false, NULL, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1221,7 +1221,7 @@ enum {
|
||||
/* Triangulate methods - NGons */
|
||||
enum {
|
||||
MOD_TRIANGULATE_NGON_BEAUTY = 0,
|
||||
MOD_TRIANGULATE_NGON_SCANFILL,
|
||||
MOD_TRIANGULATE_NGON_EARCLIP,
|
||||
};
|
||||
|
||||
/* Triangulate methods - Quads */
|
||||
|
@ -122,8 +122,8 @@ EnumPropertyItem modifier_triangulate_quad_method_items[] = {
|
||||
};
|
||||
|
||||
EnumPropertyItem modifier_triangulate_ngon_method_items[] = {
|
||||
{MOD_TRIANGULATE_NGON_SCANFILL, "SCANFILL", 0, "Scanfill", "Split the polygons using a scanfill algorithm"},
|
||||
{MOD_TRIANGULATE_NGON_BEAUTY, "BEAUTY", 0, "Beauty", "Arrange the new triangles nicely, slower method"},
|
||||
{MOD_TRIANGULATE_NGON_BEAUTY, "BEAUTY", 0, "Beauty", "Arrange the new triangles evenly (slow)"},
|
||||
{MOD_TRIANGULATE_NGON_EARCLIP, "CLIP", 0, "Clip", "Split the polygons with an ear clipping algorithm"},
|
||||
{0, NULL, 0, NULL, NULL}
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user