[Bf-blender-cvs] [917ab4fbf99] master: UI: use term 'Merge Distance' instead of 'Merge Limit'

[Aaron Carlisle]

Commit: 917ab4fbf99b4d431ef4b7c357eefdcec562ce85
Author: Aaron Carlisle
Date:   Sun Jun 7 23:40:14 2020 -0400
Branches: master
https://developer.blender.org/rB917ab4fbf99b4d431ef4b7c357eefdcec562ce85

UI: use term 'Merge Distance' instead of 'Merge Limit'

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

M	source/blender/editors/sculpt_paint/sculpt.c
M	source/blender/makesrna/intern/rna_modifier.c

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

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index b4ae9c96ba7..2c050cba6b7 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -7533,7 +7533,7 @@ static void SCULPT_OT_symmetrize(wmOperatorType *ot)
                 0.001f,
                 0.0f,
                 FLT_MAX,
-                "Merge Limit",
+                "Merge Distance",
                 "Distance within which symmetrical vertices are merged",
                 0.0f,
                 1.0f);
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index d4aeae2cfe0..1fa89806ce9 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -2193,7 +2193,7 @@ static void rna_def_modifier_mirror(BlenderRNA *brna)
   RNA_def_property_range(prop, 0, FLT_MAX);
   RNA_def_property_ui_range(prop, 0, 1, 0.01, 6);
   RNA_def_property_ui_text(
-      prop, "Merge Limit", "Distance within which mirrored vertices are merged");
+      prop, "Merge Distance", "Distance within which mirrored vertices are merged");
   RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
   prop = RNA_def_property(srna, "mirror_object", PROP_POINTER, PROP_NONE);