diff options
| author | William Reynish <billrey@me.com> | 2019-05-21 21:03:43 +0300 |
|---|---|---|
| committer | William Reynish <billrey@me.com> | 2019-05-21 21:03:43 +0300 |
| commit | 10260fc773c4aeb88756cb22658e49ab14d156b7 (patch) | |
| tree | 2bd06bedc41030dfb32ab21d4a23c066bcdbf5a0 /source/blender/makesrna/intern/rna_scene.c | |
| parent | 522320dadf5a675e3fb94084bb8eddfe55b15127 (diff) | |
UI: Fix wrong naming and tooltips
Double Threshold -> Merge Threshold
This relates to Auto Merge
AutoMerge Editing -> Auto Merge
No need for redundant 'Editing' here
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index a4e060d55ef..bf2bf69fc22 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2836,7 +2836,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) prop = RNA_def_property(srna, "double_threshold", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "doublimit"); RNA_def_property_ui_text( - prop, "Double Threshold", "Limit for removing duplicates and 'Auto Merge'"); + prop, "Merge Threshold", "Threshold distance for Auto Merge"); RNA_def_property_range(prop, 0.0, 1.0); RNA_def_property_ui_range(prop, 0.0, 0.1, 0.01, 6); @@ -2857,7 +2857,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) prop = RNA_def_property(srna, "use_mesh_automerge", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "automerge", 0); RNA_def_property_ui_text( - prop, "AutoMerge Editing", "Automatically merge vertices moved to the same location"); + prop, "Auto Merge", "Automatically merge vertices moved to the same location"); RNA_def_property_ui_icon(prop, ICON_AUTOMERGE_OFF, -1); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */ |