diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-04-08 09:24:33 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-04-08 09:26:54 +0300 |
commit | 35861a49eef94dd9384d967ea1c92c87408a68d9 (patch) | |
tree | 3818a5b760ebe3bf01ae7e4895380fb115a853c6 /source | |
parent | bd45ec0b06c6dfd5dcf222350bb78a055c7315a5 (diff) |
Fix T67098: Inset causes shape keys to reset exiting edit-mode
Edit-mesh interactive redo reset the meshes shape-key index.
Also copy the selection mode when copying meshes.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/editmesh.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_construct.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c index 94976ed0c96..5aaae74e670 100644 --- a/source/blender/blenkernel/intern/editmesh.c +++ b/source/blender/blenkernel/intern/editmesh.c @@ -67,6 +67,10 @@ BMEditMesh *BKE_editmesh_copy(BMEditMesh *em) * tessellation only when/if that copy ends up getting used. */ em_copy->looptris = NULL; + /* Copy various settings. */ + em_copy->selectmode = em->selectmode; + em_copy->mat_nr = em->mat_nr; + return em_copy; } diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index 592d8124b23..0d79d60e5c1 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -717,6 +717,10 @@ BMesh *BM_mesh_copy(BMesh *bm_old) MEM_freeN(vtable); MEM_freeN(ftable); + /* Copy various settings. */ + bm_new->shapenr = bm_old->shapenr; + bm_new->selectmode = bm_old->selectmode; + return bm_new; } |