diff options
author | Campbell Barton <ideasman42@gmail.com> | 2016-07-06 12:15:47 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2016-07-06 12:15:47 +0300 |
commit | 95ff9e9904d1f31d9352220a8779b4ef35c16bd8 (patch) | |
tree | 31d98da86fc765c5c914c6ea8b98f6f13fe9448c /source/blender/blenkernel/intern | |
parent | 674756bfcecef5ca644978f4e208674f9cd3a6b6 (diff) |
Cleanup: redundant 4th index in sculpt PBVH
Since moving to MLoopTri this is no longer needed.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/pbvh.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pbvh_intern.h | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index 6b6d1b400ea..8afb5b2aafe 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -276,16 +276,14 @@ static void build_mesh_leaf_node(PBVH *bvh, PBVHNode *node) /* reserve size is rough guess */ GHash *map = BLI_ghash_int_new_ex("build_mesh_leaf_node gh", 2 * totface); - int (*face_vert_indices)[4] = MEM_callocN(sizeof(int[4]) * totface, + int (*face_vert_indices)[3] = MEM_mallocN(sizeof(int[3]) * totface, "bvh node face vert indices"); - node->face_vert_indices = (const int (*)[4])face_vert_indices; + node->face_vert_indices = (const int (*)[3])face_vert_indices; for (int i = 0; i < totface; ++i) { const MLoopTri *lt = &bvh->looptri[node->prim_indices[i]]; - const int sides = 3; - - for (int j = 0; j < sides; ++j) { + for (int j = 0; j < 3; ++j) { face_vert_indices[i][j] = map_insert_vert(bvh, map, &node->face_verts, &node->uniq_verts, bvh->mloop[lt->tri[j]].v); diff --git a/source/blender/blenkernel/intern/pbvh_intern.h b/source/blender/blenkernel/intern/pbvh_intern.h index 4d2307c3e12..19d3b31bd31 100644 --- a/source/blender/blenkernel/intern/pbvh_intern.h +++ b/source/blender/blenkernel/intern/pbvh_intern.h @@ -83,12 +83,11 @@ struct PBVHNode { * array. The array is sized to match 'totprim', and each of * the face's corners gets an index into the vert_indices * array, in the same order as the corners in the original - * MFace. The fourth value should not be used if the original - * face is a triangle. + * MLoopTri. * * Used for leaf nodes in a mesh-based PBVH (not multires.) */ - const int (*face_vert_indices)[4]; + const int (*face_vert_indices)[3]; /* Indicates whether this node is a leaf or not; also used for * marking various updates that need to be applied. */ |