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/makesrna | |
| parent | c99c45a1e3563f4b6dad6eb9498a5ae0f386b93d (diff) | |
| parent | be25a0faa7ff0f64e9d75f5f48c042bb8595f142 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index b13bf07761f..12140e3a8ed 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -312,7 +312,7 @@ static void rna_Object_active_shape_update(bContext *C, PointerRNA *ptr) switch (ob->type) { case OB_MESH: EDBM_mesh_load(ob); - EDBM_mesh_make(scene->toolsettings, ob, true); + EDBM_mesh_make(ob, scene->toolsettings->selectmode, true); DEG_id_tag_update(ob->data, 0); |