[Bf-blender-cvs] [10260fc773c] master: UI: Fix wrong naming and tooltips

[William Reynish]

Commit: 10260fc773c4aeb88756cb22658e49ab14d156b7
Author: William Reynish
Date:   Tue May 21 20:03:43 2019 +0200
Branches: master
https://developer.blender.org/rB10260fc773c4aeb88756cb22658e49ab14d156b7

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

===================================================================

M	source/blender/makesrna/intern/rna_scene.c

===================================================================

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 */