[Bf-blender-cvs] [962b87f06a8] master: UI: Clean up use of the term "Metaballs"
Yevgeny Makarov
noreply at git.blender.org
Wed Feb 24 20:45:13 CET 2021
Commit: 962b87f06a8e3dfadf86ca93ca2083db7866b98e
Author: Yevgeny Makarov
Date: Wed Feb 24 13:44:24 2021 -0600
Branches: master
https://developer.blender.org/rB962b87f06a8e3dfadf86ca93ca2083db7866b98e
UI: Clean up use of the term "Metaballs"
Clear the weird term "Metaelement".
These are the metaballs (elements) inside one metaball objects.
- "Meta Ball" to "Metaball"
- "Metaelement", "Meta element" to "Metaball element"
Differential Revision: https://developer.blender.org/D9910
===================================================================
M release/scripts/startup/bl_operators/wm.py
M source/blender/editors/metaball/mball_edit.c
M source/blender/editors/metaball/mball_ops.c
M source/blender/makesrna/intern/rna_meta.c
M source/blender/makesrna/intern/rna_meta_api.c
===================================================================
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index b14f9c05210..06b3b4defcc 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -2066,7 +2066,7 @@ class WM_OT_batch_rename(Operator):
# Enum identifiers are compared with 'object.type'.
('MESH', "Meshes", ""),
('CURVE', "Curves", ""),
- ('META', "Meta Balls", ""),
+ ('META', "Metaballs", ""),
('ARMATURE', "Armatures", ""),
('LATTICE', "Lattices", ""),
('GPENCIL', "Grease Pencils", ""),
diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c
index cf453bf0c32..292052b778a 100644
--- a/source/blender/editors/metaball/mball_edit.c
+++ b/source/blender/editors/metaball/mball_edit.c
@@ -205,7 +205,7 @@ void MBALL_OT_select_all(wmOperatorType *ot)
{
/* identifiers */
ot->name = "(De)select All";
- ot->description = "Change selection of all meta elements";
+ ot->description = "Change selection of all metaball elements";
ot->idname = "MBALL_OT_select_all";
/* callback functions */
@@ -529,7 +529,7 @@ void MBALL_OT_select_random_metaelems(struct wmOperatorType *ot)
{
/* identifiers */
ot->name = "Select Random";
- ot->description = "Randomly select metaelements";
+ ot->description = "Randomly select metaball elements";
ot->idname = "MBALL_OT_select_random_metaelems";
/* callback functions */
@@ -587,8 +587,8 @@ static int duplicate_metaelems_exec(bContext *C, wmOperator *UNUSED(op))
void MBALL_OT_duplicate_metaelems(wmOperatorType *ot)
{
/* identifiers */
- ot->name = "Duplicate Metaelements";
- ot->description = "Duplicate selected metaelement(s)";
+ ot->name = "Duplicate Metaball Elements";
+ ot->description = "Duplicate selected metaball element(s)";
ot->idname = "MBALL_OT_duplicate_metaelems";
/* callback functions */
@@ -647,7 +647,7 @@ void MBALL_OT_delete_metaelems(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Delete";
- ot->description = "Delete selected metaelement(s)";
+ ot->description = "Delete selected metaball element(s)";
ot->idname = "MBALL_OT_delete_metaelems";
/* callback functions */
@@ -692,7 +692,7 @@ void MBALL_OT_hide_metaelems(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Hide Selected";
- ot->description = "Hide (un)selected metaelement(s)";
+ ot->description = "Hide (un)selected metaball element(s)";
ot->idname = "MBALL_OT_hide_metaelems";
/* callback functions */
@@ -739,7 +739,7 @@ void MBALL_OT_reveal_metaelems(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Reveal Hidden";
- ot->description = "Reveal all hidden metaelements";
+ ot->description = "Reveal all hidden metaball elements";
ot->idname = "MBALL_OT_reveal_metaelems";
/* callback functions */
diff --git a/source/blender/editors/metaball/mball_ops.c b/source/blender/editors/metaball/mball_ops.c
index a54ec384d8e..e57161928b0 100644
--- a/source/blender/editors/metaball/mball_ops.c
+++ b/source/blender/editors/metaball/mball_ops.c
@@ -53,7 +53,7 @@ void ED_operatormacros_metaball(void)
ot = WM_operatortype_append_macro("MBALL_OT_duplicate_move",
"Duplicate",
- "Make copies of the selected metaelements and move them",
+ "Make copies of the selected metaball elements and move them",
OPTYPE_UNDO | OPTYPE_REGISTER);
WM_operatortype_macro_define(ot, "MBALL_OT_duplicate_metaelems");
otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
diff --git a/source/blender/makesrna/intern/rna_meta.c b/source/blender/makesrna/intern/rna_meta.c
index a391defe542..ffdd75e63ac 100644
--- a/source/blender/makesrna/intern/rna_meta.c
+++ b/source/blender/makesrna/intern/rna_meta.c
@@ -198,7 +198,7 @@ static void rna_def_metaelement(BlenderRNA *brna)
srna = RNA_def_struct(brna, "MetaElement", NULL);
RNA_def_struct_sdna(srna, "MetaElem");
- RNA_def_struct_ui_text(srna, "Meta Element", "Blobby element in a Metaball data-block");
+ RNA_def_struct_ui_text(srna, "Metaball Element", "Blobby element in a metaball data-block");
RNA_def_struct_path_func(srna, "rna_MetaElement_path");
RNA_def_struct_ui_icon(srna, ICON_OUTLINER_DATA_META);
@@ -290,13 +290,13 @@ static void rna_def_metaball_elements(BlenderRNA *brna, PropertyRNA *cprop)
RNA_def_property_srna(cprop, "MetaBallElements");
srna = RNA_def_struct(brna, "MetaBallElements", NULL);
RNA_def_struct_sdna(srna, "MetaBall");
- RNA_def_struct_ui_text(srna, "Meta Elements", "Collection of metaball elements");
+ RNA_def_struct_ui_text(srna, "Metaball Elements", "Collection of metaball elements");
func = RNA_def_function(srna, "new", "rna_MetaBall_elements_new");
RNA_def_function_ui_description(func, "Add a new element to the metaball");
RNA_def_enum(
- func, "type", rna_enum_metaelem_type_items, MB_BALL, "", "type for the new meta-element");
- parm = RNA_def_pointer(func, "element", "MetaElement", "", "The newly created meta-element");
+ func, "type", rna_enum_metaelem_type_items, MB_BALL, "", "Type for the new metaball element");
+ parm = RNA_def_pointer(func, "element", "MetaElement", "", "The newly created metaball element");
RNA_def_function_return(func, parm);
func = RNA_def_function(srna, "remove", "rna_MetaBall_elements_remove");
@@ -337,7 +337,7 @@ static void rna_def_metaball(BlenderRNA *brna)
prop = RNA_def_property(srna, "elements", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "elems", NULL);
RNA_def_property_struct_type(prop, "MetaElement");
- RNA_def_property_ui_text(prop, "Elements", "Meta elements");
+ RNA_def_property_ui_text(prop, "Elements", "Metaball elements");
rna_def_metaball_elements(brna, prop);
/* enums */
@@ -365,7 +365,7 @@ static void rna_def_metaball(BlenderRNA *brna)
prop = RNA_def_property(srna, "threshold", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "thresh");
RNA_def_property_range(prop, 0.0f, 5.0f);
- RNA_def_property_ui_text(prop, "Threshold", "Influence of meta elements");
+ RNA_def_property_ui_text(prop, "Threshold", "Influence of metaball elements");
RNA_def_property_update(prop, 0, "rna_MetaBall_update_data");
/* texture space */
diff --git a/source/blender/makesrna/intern/rna_meta_api.c b/source/blender/makesrna/intern/rna_meta_api.c
index 178209d1152..19d0b35959b 100644
--- a/source/blender/makesrna/intern/rna_meta_api.c
+++ b/source/blender/makesrna/intern/rna_meta_api.c
@@ -54,7 +54,7 @@ void RNA_api_meta(StructRNA *srna)
PropertyRNA *parm;
func = RNA_def_function(srna, "transform", "rna_Meta_transform");
- RNA_def_function_ui_description(func, "Transform meta elements by a matrix");
+ RNA_def_function_ui_description(func, "Transform metaball elements by a matrix");
parm = RNA_def_float_matrix(func, "matrix", 4, 4, NULL, 0.0f, 0.0f, "", "Matrix", 0.0f, 0.0f);
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
More information about the Bf-blender-cvs
mailing list