UI: Make Custom Normal naming consistent

This changes the naming of "Custom Split Normals" or "Split Normals" to be "Custom Normals"

This addresses #134744, only UI naming has been adjusted.
Internal/External APIs are left unchanged.

Pull Request: https://projects.blender.org/blender/blender/pulls/140440
This commit is contained in:
Aaron Carlisle
2025-06-22 01:28:02 +02:00
committed by Aaron Carlisle
parent 17f5c826bb
commit f0675f05a7
8 changed files with 18 additions and 19 deletions

View File

@@ -398,7 +398,7 @@ class ExportFBX(bpy.types.Operator, ExportHelper):
('SMOOTH_GROUP', "Smoothing Groups", "Write face smoothing groups"),
),
description="Export smoothing information "
"(prefer 'Normals Only' option if your target importer understand split normals)",
"(prefer 'Normals Only' option if your target importer understands custom normals)",
default='OFF',
)
colors_type: EnumProperty(

View File

@@ -739,9 +739,9 @@ static wmOperatorStatus mesh_customdata_custom_splitnormals_add_exec(bContext *C
void MESH_OT_customdata_custom_splitnormals_add(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Add Custom Split Normals Data";
ot->name = "Add Custom Normals Data";
ot->idname = "MESH_OT_customdata_custom_splitnormals_add";
ot->description = "Add a custom split normals layer, if none exists yet";
ot->description = "Add a custom normals layer, if none exists yet";
/* API callbacks. */
ot->exec = mesh_customdata_custom_splitnormals_add_exec;
@@ -782,9 +782,9 @@ static wmOperatorStatus mesh_customdata_custom_splitnormals_clear_exec(bContext
void MESH_OT_customdata_custom_splitnormals_clear(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Clear Custom Split Normals Data";
ot->name = "Clear Custom Normals Data";
ot->idname = "MESH_OT_customdata_custom_splitnormals_clear";
ot->description = "Remove the custom split normals layer, if it exists";
ot->description = "Remove the custom normals layer, if it exists";
/* API callbacks. */
ot->exec = mesh_customdata_custom_splitnormals_clear_exec;

View File

@@ -1401,7 +1401,7 @@ static void TRANSFORM_OT_rotate_normal(wmOperatorType *ot)
{
/* Identifiers. */
ot->name = "Rotate Normals";
ot->description = "Rotate split normal of selected items";
ot->description = "Rotate custom normal of selected items";
ot->idname = OP_NORMAL_ROTATION;
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;

View File

@@ -2189,8 +2189,8 @@ static void rna_def_mlooptri(BlenderRNA *brna)
RNA_def_property_float_funcs(prop, "rna_MeshLoopTriangle_split_normals_get", nullptr, nullptr);
RNA_def_property_ui_text(
prop,
"Split Normals",
"Local space unit length split normal vectors of the face corners of this triangle");
"Custom Normals",
"Local space unit length custom normal vectors of the face corners of this triangle");
prop = RNA_def_property(srna, "area", PROP_FLOAT, PROP_UNSIGNED);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
@@ -3309,7 +3309,7 @@ static void rna_def_mesh(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, nullptr, "", 0);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(
prop, "Has Custom Normals", "True if there are custom split normals data in this mesh");
prop, "Has Custom Normals", "True if there is custom normal data for this mesh");
RNA_def_property_boolean_funcs(prop, "rna_Mesh_has_custom_normals_get", nullptr);
RNA_define_verify_sdna(true);

View File

@@ -266,9 +266,9 @@ void RNA_api_mesh(StructRNA *srna)
RNA_def_function_flag(func, FUNC_USE_REPORTS);
RNA_def_function_ui_description(
func,
"Compute tangents and bitangent signs, to be used together with the split normals "
"Compute tangents and bitangent signs, to be used together with the custom normals "
"to get a complete tangent space for normal mapping "
"(split normals are also computed if not yet present)");
"(custom normals are also computed if not yet present)");
RNA_def_string(func,
"uvmap",
nullptr,
@@ -305,7 +305,7 @@ void RNA_api_mesh(StructRNA *srna)
func = RNA_def_function(srna, "normals_split_custom_set", "rna_Mesh_normals_split_custom_set");
RNA_def_function_ui_description(func,
"Define custom split normals of this mesh "
"Define custom normals of this mesh "
"(use zero-vectors to keep auto ones)");
RNA_def_function_flag(func, FUNC_USE_REPORTS);
/* TODO: see how array size of 0 works, this shouldn't be used. */
@@ -316,10 +316,9 @@ void RNA_api_mesh(StructRNA *srna)
func = RNA_def_function(srna,
"normals_split_custom_set_from_vertices",
"rna_Mesh_normals_split_custom_set_from_vertices");
RNA_def_function_ui_description(
func,
"Define custom split normals of this mesh, from vertices' normals "
"(use zero-vectors to keep auto ones)");
RNA_def_function_ui_description(func,
"Define custom normals of this mesh, from vertices' normals "
"(use zero-vectors to keep auto ones)");
RNA_def_function_flag(func, FUNC_USE_REPORTS);
/* TODO: see how array size of 0 works, this shouldn't be used. */
parm = RNA_def_float_array(func, "normals", 1, nullptr, -1.0f, 1.0f, "", "Normals", 0.0f, 0.0f);

View File

@@ -7812,7 +7812,7 @@ static void rna_def_modifier_weightednormal(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, nullptr, "flag", MOD_WEIGHTEDNORMAL_KEEP_SHARP);
RNA_def_property_ui_text(prop,
"Keep Sharp",
"Keep sharp edges as computed for default split normals, "
"Keep sharp edges as computed for default custom normals, "
"instead of setting a single weighted normal for each vertex");
RNA_def_property_update(prop, 0, "rna_Modifier_update");

View File

@@ -4967,7 +4967,7 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna)
prop = RNA_def_property(srna, "show_split_normals", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "overlay.edit_flag", V3D_OVERLAY_EDIT_LOOP_NORMALS);
RNA_def_property_ui_text(
prop, "Display Split Normals", "Display vertex-per-face normals as lines");
prop, "Display Custom Normals", "Display vertex-per-face normals as lines");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, nullptr);
prop = RNA_def_property(srna, "show_faces", PROP_BOOLEAN, PROP_NONE);

View File

@@ -2773,7 +2773,7 @@ static void rna_def_userdef_theme_space_view3d(BlenderRNA *brna)
prop = RNA_def_property(srna, "split_normal", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, nullptr, "loop_normal");
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Split Normal", "");
RNA_def_property_ui_text(prop, "Custom Normal", "");
RNA_def_property_update(prop, 0, "rna_userdef_update");
/* Armature Object specific. */