diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-09-02 17:32:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-09-02 17:35:22 +0300 |
| commit | a3559a70dd57110fd4e1cc568928ee1e3504959a (patch) | |
| tree | 8beced38137ff9a86aebb30c4848891695cc80ca /source/blender/editors/transform/transform_conversions.c | |
| parent | 2356f60c6200188a2f88d6d890ff78fa8fd2b4d3 (diff) | |
Fix T69404: Merge by distance crash with Unselected
Error introduced when removing the automerge bmesh operator.
Diffstat (limited to 'source/blender/editors/transform/transform_conversions.c')
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 887d4bcf0e8..328cb1d1bbf 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -7128,10 +7128,11 @@ static void special_aftertrans_update__mesh(bContext *UNUSED(C), TransInfo *t) if (t->scene->toolsettings->automerge & AUTO_MERGE) { if (t->scene->toolsettings->automerge & AUTO_MERGE_AND_SPLIT) { - EDBM_automerge_and_split(t->scene, tc->obedit, true, true, true, hflag); + EDBM_automerge_and_split( + tc->obedit, true, true, true, hflag, t->scene->toolsettings->doublimit); } else { - EDBM_automerge(t->scene, tc->obedit, true, hflag); + EDBM_automerge(tc->obedit, true, hflag, t->scene->toolsettings->doublimit); } } |