diff options
| author | Andrew Wiggin <ender79bl@gmail.com> | 2011-10-10 18:56:09 +0400 |
|---|---|---|
| committer | Andrew Wiggin <ender79bl@gmail.com> | 2011-10-10 18:56:09 +0400 |
| commit | 69732dbe2145aecab77b14508aaa65525237a121 (patch) | |
| tree | 808cf10c8c01205b45ca34d0e57f4235655277a6 /source/blender/blenkernel/intern | |
| parent | 5ae7a91eb38546f0e0255a8e86807b42afeefc34 (diff) | |
Miscellaneous cleanup, comment changes, and asserts. Should be no functional changes.
Diffstat (limited to 'source/blender/blenkernel/intern')
4 files changed, 10 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index e32a398a926..e41fe45e121 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -583,9 +583,15 @@ BVHTree* bvhtree_from_mesh_faces(BVHTreeFromMesh *data, DerivedMesh *mesh, float tree = BLI_bvhtree_new(numFaces, epsilon, tree_type, axis); if(tree != NULL) { - /* XXX, for snap only, em & dm are assumed to be aligned, since dm is the em's cage */ BMEditMesh *em= data->em_evil; if(em) { + /*data->em_evil is only set for snapping, and only for the mesh of the object + which is currently open in edit mode. When set, the bvhtree should not contain + faces that will interfere with snapping (e.g. faces that are hidden/selected + or faces that have selected verts).*/ + + /* XXX, for snap only, em & dm are assumed to be aligned, since dm is the em's cage */ + /*Insert BMesh-tesselation triangles into the bvh tree, unless they are hidden and/or selected. Even if the faces themselves are not selected for the snapped transform, having a vertex selected means the face (and thus it's tesselated diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 98acf24e506..f8dfbd4b7b6 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -1963,7 +1963,6 @@ DerivedMesh *CDDM_from_BMEditMesh(BMEditMesh *em, Mesh *UNUSED(me), int use_mdis med->v1 = BM_GetIndex(eed->v1); med->v2 = BM_GetIndex(eed->v2); - med->flag = ME_EDGEDRAW|ME_EDGERENDER; if (has_crease) med->crease = (unsigned char)(BM_GetCDf(&bm->edata, eed, CD_CREASE)*255.0f); diff --git a/source/blender/blenkernel/intern/editderivedbmesh.c b/source/blender/blenkernel/intern/editderivedbmesh.c index 40c2485196a..1b9116a7533 100644 --- a/source/blender/blenkernel/intern/editderivedbmesh.c +++ b/source/blender/blenkernel/intern/editderivedbmesh.c @@ -1228,9 +1228,7 @@ static void bmDM_getEdge(DerivedMesh *dm, int index, MEdge *edge_r) edge_r->crease = (unsigned char) (BM_GetCDf(&bm->edata, e, CD_CREASE)*255.0f); } - /* Should this be set in BMFlags_To_MEFlags? */ - edge_r->flag = ME_EDGERENDER; - edge_r->flag |= BMFlags_To_MEFlags(e); + edge_r->flag = BMFlags_To_MEFlags(e); edge_r->v1 = GET_INT_FROM_POINTER(BLI_ghash_lookup(bmdm->vhash, e->v1)); edge_r->v2 = GET_INT_FROM_POINTER(BLI_ghash_lookup(bmdm->vhash, e->v2)); @@ -1308,9 +1306,7 @@ static void bmDM_copyEdgeArray(DerivedMesh *dm, MEdge *edge_r) edge_r->crease = (unsigned char) (BM_GetCDf(&bm->edata, ee, CD_CREASE)*255.0f); } - /* Should this be set in BMFlags_To_MEFlags? */ - edge_r->flag = ME_EDGERENDER; - edge_r->flag |= BMFlags_To_MEFlags(ee); + edge_r->flag = BMFlags_To_MEFlags(ee); edge_r->v1 = (int)BM_GetIndex(ee->v1); edge_r->v2 = (int)BM_GetIndex(ee->v2); diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index 76e74034ec7..1484a91f1f2 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -406,7 +406,7 @@ void BKE_mesh_calc_edges(Mesh *mesh, int update) int j; for (j=0; j < mp->totloop; j++, l++) { /* lookup hashed edge index */ - med_index = BLI_edgehash_lookup(eh, l_prev->v, l->v); + med_index = GET_INT_FROM_POINTER(BLI_edgehash_lookup(eh, l_prev->v, l->v)); l_prev->e = med_index; l_prev= l; } |