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:
authorGermano Cavalcante <germano.costa@ig.com.br>2022-04-06 01:49:30 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2022-04-06 01:56:03 +0300
commit9fbf7f1180501fc868a38dccecfbc71f6747b4e9 (patch)
treeaea6a0ecd2c920751ce8ee0a429de0210650b6b3 /source/blender/editors/transform/transform_snap_object.cc
parent684b95804e8fe8a78488b96b02285b2854809ff9 (diff)
BVH Utils: Remove '_allocated' members from 'BVHTreeFromMesh'
The parameters indicating whether it is allocated are always `false` and it is up to the caller to free them. Also clang-format was triggered.
Diffstat (limited to 'source/blender/editors/transform/transform_snap_object.cc')
-rw-r--r--source/blender/editors/transform/transform_snap_object.cc30
1 files changed, 10 insertions, 20 deletions
diff --git a/source/blender/editors/transform/transform_snap_object.cc b/source/blender/editors/transform/transform_snap_object.cc
index 520e00de307..3489cfc4cda 100644
--- a/source/blender/editors/transform/transform_snap_object.cc
+++ b/source/blender/editors/transform/transform_snap_object.cc
@@ -275,17 +275,16 @@ static SnapObjectData *snap_object_data_mesh_get(SnapObjectContext *sctx,
/* The tree is owned by the Mesh and may have been freed since we last used. */
is_dirty = true;
}
- else if (!sod->treedata_mesh.looptri_allocated &&
- sod->treedata_mesh.looptri != me_eval->runtime.looptris.array) {
+ else if (sod->treedata_mesh.looptri != me_eval->runtime.looptris.array) {
is_dirty = true;
}
- else if (!sod->treedata_mesh.vert_allocated && sod->treedata_mesh.vert != me_eval->mvert) {
+ else if (sod->treedata_mesh.vert != me_eval->mvert) {
is_dirty = true;
}
- else if (!sod->treedata_mesh.loop_allocated && sod->treedata_mesh.loop != me_eval->mloop) {
+ else if (sod->treedata_mesh.loop != me_eval->mloop) {
is_dirty = true;
}
- else if (!sod->treedata_mesh.edge_allocated && sod->treedata_mesh.edge != me_eval->medge) {
+ else if (sod->treedata_mesh.edge != me_eval->medge) {
is_dirty = true;
}
else if (sod->poly != me_eval->mpoly) {
@@ -901,7 +900,8 @@ static bool raycastEditMesh(SnapObjectContext *sctx,
sctx->callbacks.edit_mesh.test_face_fn,
sctx->callbacks.edit_mesh.user_data);
- bvhtree_from_editmesh_looptri_ex(treedata, em, elem_mask, looptri_num_active, 0.0f, 4, 6, false);
+ bvhtree_from_editmesh_looptri_ex(
+ treedata, em, elem_mask, looptri_num_active, 0.0f, 4, 6, false);
MEM_freeN(elem_mask);
}
@@ -2364,12 +2364,6 @@ static short snapMesh(SnapObjectContext *sctx,
sod->has_loose_edge = false;
}
sod->cached[0] = treedata_tmp.cached;
- BLI_assert(!ELEM(true,
- treedata_tmp.vert_allocated,
- treedata_tmp.edge_allocated,
- treedata_tmp.face_allocated,
- treedata_tmp.loop_allocated,
- treedata_tmp.looptri_allocated));
}
if (sctx->runtime.snap_to_flag & SCE_SNAP_MODE_VERTEX) {
@@ -2380,12 +2374,6 @@ static short snapMesh(SnapObjectContext *sctx,
sod->has_loose_vert = false;
}
sod->cached[1] = treedata_tmp.cached;
- BLI_assert(!ELEM(true,
- treedata_tmp.vert_allocated,
- treedata_tmp.edge_allocated,
- treedata_tmp.face_allocated,
- treedata_tmp.loop_allocated,
- treedata_tmp.looptri_allocated));
}
}
else {
@@ -2565,7 +2553,8 @@ static short snapEditMesh(SnapObjectContext *sctx,
(bool (*)(BMElem *, void *))sctx->callbacks.edit_mesh.test_vert_fn,
sctx->callbacks.edit_mesh.user_data);
- bvhtree_from_editmesh_verts_ex(&treedata, em, verts_mask, verts_num_active, 0.0f, 2, 6, false);
+ bvhtree_from_editmesh_verts_ex(
+ &treedata, em, verts_mask, verts_num_active, 0.0f, 2, 6, false);
MEM_freeN(verts_mask);
}
else {
@@ -2597,7 +2586,8 @@ static short snapEditMesh(SnapObjectContext *sctx,
(bool (*)(BMElem *, void *))sctx->callbacks.edit_mesh.test_edge_fn,
sctx->callbacks.edit_mesh.user_data);
- bvhtree_from_editmesh_edges_ex(&treedata, em, edges_mask, edges_num_active, 0.0f, 2, 6, false);
+ bvhtree_from_editmesh_edges_ex(
+ &treedata, em, edges_mask, edges_num_active, 0.0f, 2, 6, false);
MEM_freeN(edges_mask);
}
else {