[Bf-blender-cvs] [4614c63] master: BMesh: bmesh_sfme now initializes the copy
Campbell Barton
noreply at git.blender.org
Tue Apr 8 04:59:21 CEST 2014
Commit: 4614c63d5dcbf10a16e74235c452fe69ad0cddee
Author: Campbell Barton
Date: Tue Apr 8 12:54:29 2014 +1000
https://developer.blender.org/rB4614c63d5dcbf10a16e74235c452fe69ad0cddee
BMesh: bmesh_sfme now initializes the copy
===================================================================
M source/blender/bmesh/intern/bmesh_core.c
M source/blender/bmesh/intern/bmesh_mods.c
===================================================================
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c
index 3efee37..faa0e94 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -1242,7 +1242,7 @@ error:
return NULL;
}
-static BMFace *bm_face_create__sfme(BMesh *bm, BMFace *UNUSED(example))
+static BMFace *bm_face_create__sfme(BMesh *bm, BMFace *f_example)
{
BMFace *f;
#ifdef USE_BMESH_HOLES
@@ -1260,7 +1260,7 @@ static BMFace *bm_face_create__sfme(BMesh *bm, BMFace *UNUSED(example))
f->totbounds = 1;
#endif
- CustomData_bmesh_set_default(&bm->pdata, &f->head.data);
+ BM_elem_attrs_copy(bm, bm, f, f_example);
return f;
}
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c
index a72ebbb..3b63931 100644
--- a/source/blender/bmesh/intern/bmesh_mods.c
+++ b/source/blender/bmesh/intern/bmesh_mods.c
@@ -303,8 +303,6 @@ BMFace *BM_face_split(BMesh *bm, BMFace *f,
#endif
if (f_new) {
- BM_elem_attrs_copy(bm, bm, f, f_new);
-
/* handle multires update */
if (has_mdisp) {
BMLoop *l_iter;
@@ -393,9 +391,6 @@ BMFace *BM_face_split_n(BMesh *bm, BMFace *f,
* The radial_next is for f and goes from v_b to v_a */
if (f_new) {
- BM_elem_attrs_copy(bm, bm, f, f_new);
- copy_v3_v3(f_new->no, f->no);
-
e = (*r_l)->e;
for (i = 0; i < n; i++) {
v_new = bmesh_semv(bm, v_b, e, &e_new);
More information about the Bf-blender-cvs
mailing list