sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T66922: Merge by distance tooltip text wrong

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

Reviewers: campbellbarton

Maniphest Tasks: T66922

Differential Revision: https://developer.blender.org/D5462
This commit is contained in:
Philipp Oeser 2019-08-12 13:34:46 +02:00
parent ca9698b8e0
commit f555379ce3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/bmesh/intern/bmesh_opdefines.c
View File

@ -336,7 +336,7 @@ static BMOpDefine bmo_find_doubles_def = {
/* slots_in */ /* slots_in */
{{"verts", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT}}, /* input vertices */ {{"verts", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT}}, /* input vertices */
{"keep_verts", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT}}, /* list of verts to keep */ {"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'}}, {{'\0'}},
}, },
/* slots_out */ /* slots_out */
@ -379,7 +379,7 @@ static BMOpDefine bmo_automerge_def = {
"automerge", "automerge",
/* slots_in */ /* slots_in */
{{"verts", BMO_OP_SLOT_ELEMENT_BUF, {BM_VERT}}, /* input verts */ {{"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'}},
}, },
{{{'\0'}}}, /* no output */ {{{'\0'}}}, /* no output */
@ -1173,7 +1173,7 @@ static BMOpDefine bmo_dissolve_limit_def = {
static BMOpDefine bmo_dissolve_degenerate_def = { static BMOpDefine bmo_dissolve_degenerate_def = {
"dissolve_degenerate", "dissolve_degenerate",
/* slots_in */ /* 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}}, {"edges", BMO_OP_SLOT_ELEMENT_BUF, {BM_EDGE}},
{{'\0'}}, {{'\0'}},
}, },

4
source/blender/editors/mesh/editmesh_tools.c
View File

@ -3190,7 +3190,7 @@ void MESH_OT_remove_doubles(wmOperatorType *ot)
1e-6f, 1e-6f,
50.0f, 50.0f,
"Merge Distance", "Merge Distance",
"Minimum distance between elements to merge", "Maximum distance between elements to merge",
1e-5f, 1e-5f,
10.0f); 10.0f);
RNA_def_boolean(ot->srna, RNA_def_boolean(ot->srna,
@ -5791,7 +5791,7 @@ void MESH_OT_dissolve_degenerate(wmOperatorType *ot)
1e-6f, 1e-6f,
50.0f, 50.0f,
"Merge Distance", "Merge Distance",
"Minimum distance between elements to merge", "Maximum distance between elements to merge",
1e-5f, 1e-5f,
10.0f); 10.0f);
} }