From 63a6268e83a7137b0ee5574a783fed29aeae12fd Mon Sep 17 00:00:00 2001 From: Yevgeny Makarov Date: Fri, 26 Mar 2021 12:07:50 -0400 Subject: 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 --- source/blender/makesrna/intern/rna_action.c | 6 ++++-- source/blender/makesrna/intern/rna_depsgraph.c | 4 ++-- source/blender/makesrna/intern/rna_modifier.c | 5 +++-- source/blender/makesrna/intern/rna_object.c | 10 +++++----- source/blender/makesrna/intern/rna_userdef.c | 3 ++- 5 files changed, 16 insertions(+), 12 deletions(-) (limited to 'source/blender/makesrna') 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); -- cgit v1.2.3