[Bf-blender-cvs] [63a6268e83a] master: UI: Use unified format for "Warning" in descriptions
Yevgeny Makarov
noreply at git.blender.org
Fri Mar 26 17:08:36 CET 2021
Commit: 63a6268e83a7137b0ee5574a783fed29aeae12fd
Author: Yevgeny Makarov
Date: Fri Mar 26 12:07:50 2021 -0400
Branches: master
https://developer.blender.org/rB63a6268e83a7137b0ee5574a783fed29aeae12fd
UI: Use unified format for "Warning" in descriptions
Warnings in tooltips were using inconsistent formatting, some in
parantheses, some not, some in caps, others not, some on new lines,
some not, etc.
This patch uses a consistent new line and no capitals for these cases.
Differential Revision: https://developer.blender.org/D9904
===================================================================
M release/scripts/startup/bl_operators/anim.py
M source/blender/editors/armature/armature_naming.c
M source/blender/editors/armature/pose_edit.c
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/object/object_data_transfer.c
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/makesrna/intern/rna_action.c
M source/blender/makesrna/intern/rna_depsgraph.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/release/scripts/startup/bl_operators/anim.py b/release/scripts/startup/bl_operators/anim.py
index ab56b24d186..81a28964389 100644
--- a/release/scripts/startup/bl_operators/anim.py
+++ b/release/scripts/startup/bl_operators/anim.py
@@ -355,7 +355,8 @@ class UpdateAnimatedTransformConstraint(Operator):
use_convert_to_radians: BoolProperty(
name="Convert to Radians",
- description="Convert fcurves/drivers affecting rotations to radians (Warning: use this only once!)",
+ description="Convert f-curves/drivers affecting rotations to radians.\n"
+ "Warning: Use this only once",
default=True,
)
diff --git a/source/blender/editors/armature/armature_naming.c b/source/blender/editors/armature/armature_naming.c
index 8bcaf72f678..70154695dcd 100644
--- a/source/blender/editors/armature/armature_naming.c
+++ b/source/blender/editors/armature/armature_naming.c
@@ -525,8 +525,8 @@ void ARMATURE_OT_flip_names(wmOperatorType *ot)
"do_strip_numbers",
false,
"Strip Numbers",
- "Try to remove right-most dot-number from flipped names "
- "(WARNING: may result in incoherent naming in some cases)");
+ "Try to remove right-most dot-number from flipped names.\n"
+ "Warning: May result in incoherent naming in some cases");
}
/** \} */
diff --git a/source/blender/editors/armature/pose_edit.c b/source/blender/editors/armature/pose_edit.c
index e65871c0896..f5daa427149 100644
--- a/source/blender/editors/armature/pose_edit.c
+++ b/source/blender/editors/armature/pose_edit.c
@@ -593,8 +593,8 @@ void POSE_OT_flip_names(wmOperatorType *ot)
"do_strip_numbers",
false,
"Strip Numbers",
- "Try to remove right-most dot-number from flipped names "
- "(WARNING: may result in incoherent naming in some cases)");
+ "Try to remove right-most dot-number from flipped names.\n"
+ "Warning: May result in incoherent naming in some cases");
}
/* ------------------ */
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index ade21f58232..56d971ea59b 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -6886,8 +6886,8 @@ void MESH_OT_sort_elements(wmOperatorType *ot)
"SELECTED",
0,
"Selected",
- "Move all selected elements in first places, preserving their relative order "
- "(WARNING: this will affect unselected elements' indices as well!)"},
+ "Move all selected elements in first places, preserving their relative order.\n"
+ "Warning: This will affect unselected elements' indices as well"},
{SRT_RANDOMIZE, "RANDOMIZE", 0, "Randomize", "Randomize order of selected elements"},
{SRT_REVERSE, "REVERSE", 0, "Reverse", "Reverse current order of selected elements"},
{0, NULL, 0, NULL, NULL},
diff --git a/source/blender/editors/object/object_data_transfer.c b/source/blender/editors/object/object_data_transfer.c
index 72ef72403cf..22c9d669ff3 100644
--- a/source/blender/editors/object/object_data_transfer.c
+++ b/source/blender/editors/object/object_data_transfer.c
@@ -684,7 +684,8 @@ void OBJECT_OT_data_transfer(wmOperatorType *ot)
false,
"Auto Transform",
"Automatically compute transformation to get the best possible match between source and "
- "destination meshes (WARNING: results will never be as good as manual matching of objects)");
+ "destination meshes.\n"
+ "Warning: Results will never be as good as manual matching of objects");
RNA_def_boolean(ot->srna,
"use_object_transform",
true,
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index dc9205106ab..21ddea922d8 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -2263,7 +2263,8 @@ static const EnumPropertyItem outliner_lib_op_type_items[] = {
"DELETE",
ICON_X,
"Delete",
- "Delete this library and all its item from Blender - WARNING: no undo"},
+ "Delete this library and all its item.\n"
+ "Warning: No undo"},
{OL_LIB_RELOCATE,
"RELOCATE",
0,
diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c
index 69ddcee60fa..fb9f5e0292e 100644
--- a/source/blender/makesrna/intern/rna_action.c
+++ b/source/blender/makesrna/intern/rna_action.c
@@ -407,8 +407,10 @@ static void rna_def_dopesheet(BlenderRNA *brna)
/* Multi-word fuzzy search option for name/text filters */
prop = RNA_def_property(srna, "use_multi_word_filter", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", ADS_FLAG_FUZZY_NAMES);
- RNA_def_property_ui_text(
- prop, "Multi-Word Fuzzy Filter", "Perform fuzzy/multi-word matching (WARNING: May be slow)");
+ RNA_def_property_ui_text(prop,
+ "Multi-Word Fuzzy Filter",
+ "Perform fuzzy/multi-word matching.\n"
+ "Warning: May be slow");
RNA_def_property_ui_icon(prop, ICON_SORTALPHA, 0);
RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
diff --git a/source/blender/makesrna/intern/rna_depsgraph.c b/source/blender/makesrna/intern/rna_depsgraph.c
index 36d39c5c201..d226e2aa832 100644
--- a/source/blender/makesrna/intern/rna_depsgraph.c
+++ b/source/blender/makesrna/intern/rna_depsgraph.c
@@ -509,7 +509,7 @@ static void rna_def_depsgraph_instance(BlenderRNA *brna)
srna,
"Dependency Graph Object Instance",
"Extended information about dependency graph object iterator "
- "(WARNING: all data here is *evaluated* one, not original .blend IDs...)");
+ "(Warning: All data here is 'evaluated' one, not original .blend IDs)");
prop = RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "Object");
@@ -773,7 +773,7 @@ static void rna_def_depsgraph(BlenderRNA *brna)
RNA_def_property_ui_text(prop,
"Object Instances",
"All object instances to display or render "
- "(WARNING: only use this as an iterator, never as a sequence, "
+ "(Warning: Only use this as an iterator, never as a sequence, "
"and do not keep any references to its items)");
prop = RNA_def_property(srna, "updates", PROP_COLLECTION, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 98a2b683f18..67335b81a31 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -5920,8 +5920,9 @@ static void rna_def_modifier_triangulate(BlenderRNA *brna)
RNA_def_property_ui_text(
prop,
"Keep Normals",
- "Try to preserve custom normals (WARNING: depending on chosen triangulation method, "
- "shading may not be fully preserved, 'Fixed' method usually gives the best result here)");
+ "Try to preserve custom normals.\n"
+ "Warning: Depending on chosen triangulation method, "
+ "shading may not be fully preserved, \"Fixed\" method usually gives the best result here");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
RNA_define_lib_overridable(false);
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 70ec2b752c7..f85acf07955 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -2972,9 +2972,9 @@ static void rna_def_object(BlenderRNA *brna)
RNA_def_property_ui_text(
prop,
"Dimensions",
- "Absolute bounding box dimensions of the object (WARNING: assigning to it or "
- "its members multiple consecutive times will not work correctly, "
- "as this needs up-to-date evaluated data)");
+ "Absolute bounding box dimensions of the object.\n"
+ "Warning: Assigning to it or its members multiple consecutive times "
+ "will not work correctly, as this needs up-to-date evaluated data");
RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
/* delta transforms */
@@ -3077,8 +3077,8 @@ static void rna_def_object(BlenderRNA *brna)
RNA_def_property_ui_text(
prop,
"Local Matrix",
- "Parent relative transformation matrix - "
- "WARNING: Only takes into account 'Object' parenting, so e.g. in case of bone parenting "
+ "Parent relative transformation matrix.\n"
+ "Warning: Only takes into account object parenting, so e.g. in case of bone parenting "
"you get a matrix relative to the Armature object, not to the actual parent bone");
RNA_def_property_float_funcs(
prop, "rna_Object_matrix_local_get", "rna_Object_matrix_local_set", NULL);
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 4c86405a44d..6f1884f50f4 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -6215,7 +6215,8 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna)
RNA_def_property_ui_text(prop,
"Auto Save Temporary Files",
"Automatic saving of temporary files in temp directory, "
- "uses process ID (sculpt and edit mode data won't be saved)");
+ "uses process ID.\n"
+ "Warning: Sculpt and edit mode data won't be saved");
RNA_def_property_update(prop, 0, "rna_userdef_autosave_update");
prop = RNA_def_property(srna, "auto_save_time", PROP_INT, PROP_NONE);
More information about the Bf-blender-cvs
mailing list