blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 759 Projects 19 Wiki Activity

Use the term "N-gon" instead of "Polygon" for triangulation method 

This was reported for the Triangulate geometry node, but was also true
for the triangulate modifier and in exporters.

Note the modifier was introduced with "Ngon Method" in rBa7b44c82e5b9 but
was renamed to "Polygon Method" in rBf4762eb12ba5.

Since quads are also polygons (and quads have their own method), the
term "N-gon" is more appropriate here and is also described in the
glossary https://docs.blender.org/manual/en/2.92/glossary/
index.html#term-N-gon

Docs have been updated in rBM7539 (partially - the method would also
have to be renamed once this patch lands).

Note this also fixes the wrong enum used for the alembic exporter.

Fixes T83907

Maniphest Tasks: T83907

Differential Revision: https://developer.blender.org/D10022
This commit is contained in:
Philipp Oeser 2021-01-06 16:19:22 +01:00
parent 4a0b8c9427
commit 03f1d8acab
Notes: blender-bot 2023-02-13 20:09:13 +01:00 
Referenced by issue #83907, Misuse of the term Polygon in the Triangulate node
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/io/io_alembic.c
View File

@ -439,10 +439,10 @@ void WM_OT_alembic_export(wmOperatorType *ot)
RNA_def_enum(ot->srna,
"ngon_method",
rna_enum_modifier_triangulate_quad_method_items,
rna_enum_modifier_triangulate_ngon_method_items,
MOD_TRIANGULATE_NGON_BEAUTY,
"Polygon Method",
"Method for splitting the polygons into triangles");
"N-gon Method",
"Method for splitting the n-gons into triangles");
RNA_def_boolean(ot->srna,
"export_hair",

4
source/blender/editors/mesh/editmesh_tools.c
View File

@ -5340,8 +5340,8 @@ void MESH_OT_quads_convert_to_tris(wmOperatorType *ot)
"ngon_method",
rna_enum_modifier_triangulate_ngon_method_items,
MOD_TRIANGULATE_NGON_BEAUTY,
"Polygon Method",
"Method for splitting the polygons into triangles");
"N-gon Method",
"Method for splitting the n-gons into triangles");
}
/** \} */

2
source/blender/makesrna/intern/rna_modifier.c
View File

@ -5901,7 +5901,7 @@ static void rna_def_modifier_triangulate(BlenderRNA *brna)
RNA_def_property_enum_sdna(prop, NULL, "ngon_method");
RNA_def_property_enum_items(prop, rna_enum_modifier_triangulate_ngon_method_items);
RNA_def_property_ui_text(
prop, "Polygon Method", "Method for splitting the polygons into triangles");
prop, "N-gon Method", "Method for splitting the n-gons into triangles");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "min_vertices", PROP_INT, PROP_UNSIGNED);

2
source/blender/makesrna/intern/rna_nodetree.c
View File

@ -8434,7 +8434,7 @@ static void def_geo_triangulate(StructRNA *srna)
RNA_def_property_enum_items(prop, rna_node_geometry_triangulate_ngon_method_items);
RNA_def_property_enum_default(prop, GEO_NODE_TRIANGULATE_NGON_BEAUTY);
RNA_def_property_ui_text(
prop, "Polygon Method", "Method for splitting the polygons into triangles");
prop, "N-gon Method", "Method for splitting the n-gons into triangles");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
}

6
source/blender/makesrna/intern/rna_scene_api.c
View File

@ -420,10 +420,10 @@ void RNA_api_scene(StructRNA *srna)
"Method for splitting the quads into triangles");
RNA_def_enum(func,
"ngon_method",
rna_enum_modifier_triangulate_quad_method_items,
rna_enum_modifier_triangulate_ngon_method_items,
0,
"Polygon Method",
"Method for splitting the polygons into triangles");
"N-gon Method",
"Method for splitting the n-gons into triangles");
RNA_def_function_flag(func, FUNC_USE_CONTEXT);
# endif