Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-04-08 06:54:29 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-04-08 06:58:57 +0400
commit4614c63d5dcbf10a16e74235c452fe69ad0cddee (patch)
treead351517bcf6901f5d272cf617b7d6119aa38d01 /source
parent7867f32fce305382daf28c417bf07d6660bdc64c (diff)
BMesh: bmesh_sfme now initializes the copy
Diffstat (limited to 'source')
-rw-r--r--source/blender/bmesh/intern/bmesh_core.c4
-rw-r--r--source/blender/bmesh/intern/bmesh_mods.c5
2 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c
index 3efee378060..faa0e94082c 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 a72ebbb6f2c..3b639314a89 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);