internal bmesh api change: BM_elem_attrs_copy() no longer copies the selection flag.

this was slowing down modifiers since the selection flags would be copied and flushed to connected geometry.

1 files changed, 28 insertions, 9 deletions

diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c
index 1af4836c225..39b127c410e 100644
--- a/source/blender/bmesh/intern/bmesh_construct.c
+++ b/source/blender/bmesh/intern/bmesh_construct.c
@@ -817,11 +817,6 @@ void BM_elem_attrs_copy_ex(BMesh *bm_src, BMesh *bm_dst, const void *ele_src_v,
 
 	BLI_assert(ele_src->htype == ele_dst->htype);
 
-	if (ele_src->htype != ele_dst->htype) {
-		BLI_assert(!"type mismatch");
-		return;
-	}
-
 	if ((hflag_mask & BM_ELEM_SELECT) == 0) {
 		/* First we copy select */
 		if (BM_elem_flag_test((BMElem *)ele_src, BM_ELEM_SELECT)) {
@@ -833,6 +828,9 @@ void BM_elem_attrs_copy_ex(BMesh *bm_src, BMesh *bm_dst, const void *ele_src_v,
 	if (hflag_mask == 0) {
 		ele_dst->hflag = ele_src->hflag;
 	}
+	else if (hflag_mask == 0xff) {
+		/* pass */
+	}
 	else {
 		ele_dst->hflag = ((ele_dst->hflag & hflag_mask) | (ele_src->hflag & ~hflag_mask));
 	}
@@ -860,7 +858,19 @@ void BM_elem_attrs_copy_ex(BMesh *bm_src, BMesh *bm_dst, const void *ele_src_v,
 void BM_elem_attrs_copy(BMesh *bm_src, BMesh *bm_dst, const void *ele_src, void *ele_dst)
 {
 	/* BMESH_TODO, default 'use_flags' to false */
-	BM_elem_attrs_copy_ex(bm_src, bm_dst, ele_src, ele_dst, 0);
+	BM_elem_attrs_copy_ex(bm_src, bm_dst, ele_src, ele_dst, BM_ELEM_SELECT);
+}
+
+void BM_elem_select_copy(BMesh *UNUSED(bm_src), BMesh *bm_dst, const void *ele_src_v, void *ele_dst_v)
+{
+	const BMHeader *ele_src = ele_src_v;
+	BMHeader *ele_dst = ele_dst_v;
+
+	BLI_assert(ele_src->htype == ele_dst->htype);
+
+	if ((ele_src->hflag & BM_ELEM_SELECT) != (ele_dst->hflag & BM_ELEM_SELECT)) {
+		BM_elem_select_set(bm_dst, (BMElem *)ele_dst, (ele_src->hflag & BM_ELEM_SELECT) != 0);
+	}
 }
 
 /* helper function for 'BM_mesh_copy' */
@@ -894,7 +904,8 @@ static BMFace *bm_mesh_copy_new_face(BMesh *bm_new, BMesh *bm_old,
 	/* use totface in case adding some faces fails */
 	BM_elem_index_set(f_new, (bm_new->totface - 1)); /* set_inline */
 
-	BM_elem_attrs_copy(bm_old, bm_new, f, f_new);
+	BM_elem_attrs_copy_ex(bm_old, bm_new, f, f_new, 0xff);
+	f_new->head.hflag = f->head.hflag;  /* low level! don't do this for normal api use */
 
 	j = 0;
 	l_iter = l_first = BM_FACE_FIRST_LOOP(f_new);
@@ -951,7 +962,8 @@ BMesh *BM_mesh_copy(BMesh *bm_old)
 	BM_ITER_MESH_INDEX (v, &iter, bm_old, BM_VERTS_OF_MESH, i) {
 		/* copy between meshes so cant use 'example' argument */
 		v_new = BM_vert_create(bm_new, v->co, NULL, BM_CREATE_SKIP_CD);
-		BM_elem_attrs_copy(bm_old, bm_new, v, v_new);
+		BM_elem_attrs_copy_ex(bm_old, bm_new, v, v_new, 0xff);
+		v_new->head.hflag = v->head.hflag;  /* low level! don't do this for normal api use */
 		vtable[i] = v_new;
 		BM_elem_index_set(v, i); /* set_inline */
 		BM_elem_index_set(v_new, i); /* set_inline */
@@ -968,7 +980,8 @@ BMesh *BM_mesh_copy(BMesh *bm_old)
 		                       vtable[BM_elem_index_get(e->v2)],
 		                       e, BM_CREATE_SKIP_CD);
 
-		BM_elem_attrs_copy(bm_old, bm_new, e, e_new);
+		BM_elem_attrs_copy_ex(bm_old, bm_new, e, e_new, 0xff);
+		e_new->head.hflag = e->head.hflag;  /* low level! don't do this for normal api use */
 		etable[i] = e_new;
 		BM_elem_index_set(e, i); /* set_inline */
 		BM_elem_index_set(e_new, i); /* set_inline */
@@ -991,6 +1004,12 @@ BMesh *BM_mesh_copy(BMesh *bm_old)
 	bm_old->elem_index_dirty &= ~BM_FACE;
 	bm_new->elem_index_dirty &= ~BM_FACE;
 
+
+	/* low level! don't do this for normal api use */
+	bm_new->totvertsel = bm_old->totvertsel;
+	bm_new->totedgesel = bm_old->totedgesel;
+	bm_new->totfacesel = bm_old->totfacesel;
+
 	/* safety check */
 	BLI_assert(i == bm_old->totface);