[Bf-blender-cvs] [35861a49eef] master: Fix T67098: Inset causes shape keys to reset exiting edit-mode

[Campbell Barton]

Commit: 35861a49eef94dd9384d967ea1c92c87408a68d9
Author: Campbell Barton
Date:   Wed Apr 8 16:24:33 2020 +1000
Branches: master
https://developer.blender.org/rB35861a49eef94dd9384d967ea1c92c87408a68d9

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.

===================================================================

M	source/blender/blenkernel/intern/editmesh.c
M	source/blender/bmesh/intern/bmesh_construct.c

===================================================================

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;
 }