[Bf-blender-cvs] [f555379ce3d] master: Fix T66922: Merge by distance tooltip text wrong

[Philipp Oeser]

Commit: f555379ce3d934935669e1cf4b3b28cc123eb067
Author: Philipp Oeser
Date:   Mon Aug 12 13:34:46 2019 +0200
Branches: master
https://developer.blender.org/rBf555379ce3d934935669e1cf4b3b28cc123eb067

Fix T66922: Merge by distance tooltip text wrong

merge/dissolve distance is actually a maximum, not a minimum

Reviewers: campbellbarton

Maniphest Tasks: T66922

Differential Revision: https://developer.blender.org/D5462

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

M	source/blender/bmesh/intern/bmesh_opdefines.c
M	source/blender/editors/mesh/editmesh_tools.c

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

diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c
index e8b35afdcb1..b9f0bcc05f0 100644
--- a/source/blender/bmesh/intern/bmesh_opdefines.c
+++ b/source/blender/bmesh/intern/bmesh_opdefines.c
@@ -336,7 +336,7 @@ static BMOpDefine bmo_find_doubles_def = {
   /* slots_in */
   {{"verts", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT}}, /* input vertices */
    {"keep_verts", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT}}, /* list of verts to keep */
-   {"dist",         BMO_OP_SLOT_FLT}, /* minimum distance */
+   {"dist",         BMO_OP_SLOT_FLT}, /* maximum distance */
    {{'\0'}},
   },
   /* slots_out */
@@ -379,7 +379,7 @@ static BMOpDefine bmo_automerge_def = {
   "automerge",
   /* slots_in */
   {{"verts", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT}}, /* input verts */
-   {"dist",         BMO_OP_SLOT_FLT}, /* minimum distance */
+   {"dist",         BMO_OP_SLOT_FLT}, /* maximum distance */
    {{'\0'}},
   },
   {{{'\0'}}},  /* no output */
@@ -1173,7 +1173,7 @@ static BMOpDefine bmo_dissolve_limit_def = {
 static BMOpDefine bmo_dissolve_degenerate_def = {
   "dissolve_degenerate",
   /* slots_in */
-  {{"dist", BMO_OP_SLOT_FLT}, /* minimum distance to consider degenerate */
+  {{"dist", BMO_OP_SLOT_FLT}, /* maximum distance to consider degenerate */
    {"edges", BMO_OP_SLOT_ELEMENT_BUF, {BM_EDGE}},
    {{'\0'}},
   },
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index cb147772b6a..f57e8141f27 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -3190,7 +3190,7 @@ void MESH_OT_remove_doubles(wmOperatorType *ot)
                          1e-6f,
                          50.0f,
                          "Merge Distance",
-                         "Minimum distance between elements to merge",
+                         "Maximum distance between elements to merge",
                          1e-5f,
                          10.0f);
   RNA_def_boolean(ot->srna,
@@ -5791,7 +5791,7 @@ void MESH_OT_dissolve_degenerate(wmOperatorType *ot)
                          1e-6f,
                          50.0f,
                          "Merge Distance",
-                         "Minimum distance between elements to merge",
+                         "Maximum distance between elements to merge",
                          1e-5f,
                          10.0f);
 }