diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-13 18:15:37 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-13 18:15:37 +0300 |
| commit | 585208e0e911c985a062dd74b6cc689e4fb63ef8 (patch) | |
| tree | d390abe6663c5619d34dc929d68a24775d24d7fb /source/blender/editors/mesh/editmesh_utils.c | |
| parent | c99c45a1e3563f4b6dad6eb9498a5ae0f386b93d (diff) | |
| parent | be25a0faa7ff0f64e9d75f5f48c042bb8595f142 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/mesh/editmesh_utils.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c index bea2ae2aa14..70ee1627537 100644 --- a/source/blender/editors/mesh/editmesh_utils.c +++ b/source/blender/editors/mesh/editmesh_utils.c @@ -331,7 +331,7 @@ void EDBM_selectmode_to_scene(bContext *C) WM_event_add_notifier(C, NC_SCENE | ND_TOOLSETTINGS, scene); } -void EDBM_mesh_make(ToolSettings *ts, Object *ob, const bool add_key_index) +void EDBM_mesh_make(Object *ob, const int select_mode, const bool add_key_index) { Mesh *me = ob->data; BMesh *bm; @@ -358,7 +358,7 @@ void EDBM_mesh_make(ToolSettings *ts, Object *ob, const bool add_key_index) me->edit_btmesh = BKE_editmesh_create(bm, false); #endif - me->edit_btmesh->selectmode = me->edit_btmesh->bm->selectmode = ts->selectmode; + me->edit_btmesh->selectmode = me->edit_btmesh->bm->selectmode = select_mode; me->edit_btmesh->mat_nr = (ob->actcol > 0) ? ob->actcol - 1 : 0; me->edit_btmesh->ob = ob; |