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
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2014-04-15 18:18:27 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2014-04-15 18:20:07 +0400
commite4c2a3c31cf262fcf5d3577552e66b1c5e63218f (patch)
treecae7af23fb84a9ea564a67ecfb93341b1a906ff2 /source/blender/blenkernel/intern/cdderivedmesh.c
parenta15ae564217f2b47848c337e477068be0e150973 (diff)
Various fixes/improvements regarding BMesh's elem_index_dirty and BM_LOOP handling.
Most notably, BM_LOOP and BM_FACE index recompute should now be fully decoupled.
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
-rw-r--r--source/blender/blenkernel/intern/cdderivedmesh.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 176ef505a9a..b1bf1b4889f 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -2162,6 +2162,8 @@ static DerivedMesh *cddm_from_bmesh_ex(struct BMesh *bm, const bool use_mdisps,
mloop->e = BM_elem_index_get(l_iter->e);
CustomData_from_bmesh_block(&bm->ldata, &dm->loopData, l_iter->head.data, j);
+ BM_elem_index_set(l_iter, j); /* set_inline */
+
j++;
mloop++;
} while ((l_iter = l_iter->next) != l_first);
@@ -2170,7 +2172,7 @@ static DerivedMesh *cddm_from_bmesh_ex(struct BMesh *bm, const bool use_mdisps,
if (add_orig) *index++ = i;
}
- bm->elem_index_dirty &= ~BM_FACE;
+ bm->elem_index_dirty &= ~(BM_FACE | BM_LOOP);
dm->cd_flag = BM_mesh_cd_flag_from_bmesh(bm);