[Bf-blender-cvs] [42ddd87fa5e] temp-T96710-pbvh-pixels: Cleanup: remove workaround to set treedata members
Germano Cavalcante
noreply at git.blender.org
Fri Apr 8 11:07:45 CEST 2022
Commit: 42ddd87fa5ef86613f372249256874cdbfbd774e
Author: Germano Cavalcante
Date: Wed Apr 6 10:52:26 2022 -0300
Branches: temp-T96710-pbvh-pixels
https://developer.blender.org/rB42ddd87fa5ef86613f372249256874cdbfbd774e
Cleanup: remove workaround to set treedata members
This workaround is not needed since
228f7f1c850897cac85b2c4b42cf9052976b7be1
===================================================================
M source/blender/editors/transform/transform_snap_object.cc
===================================================================
diff --git a/source/blender/editors/transform/transform_snap_object.cc b/source/blender/editors/transform/transform_snap_object.cc
index eaa657ecbf3..c3168b58c47 100644
--- a/source/blender/editors/transform/transform_snap_object.cc
+++ b/source/blender/editors/transform/transform_snap_object.cc
@@ -312,20 +312,13 @@ static SnapObjectData *snap_object_data_mesh_get(SnapObjectContext *sctx,
use_hide ? BVHTREE_FROM_LOOPTRI_NO_HIDDEN : BVHTREE_FROM_LOOPTRI,
4);
- if (sod->treedata_mesh.tree == nullptr) {
- sod->treedata_mesh.vert = me_eval->mvert;
- sod->treedata_mesh.vert_normals = BKE_mesh_vertex_normals_ensure(me_eval);
- sod->treedata_mesh.loop = me_eval->mloop;
- sod->treedata_mesh.looptri = BKE_mesh_runtime_looptri_ensure(me_eval);
- BLI_assert(sod->has_looptris == false);
- }
- else {
- BLI_assert(sod->treedata_mesh.vert != nullptr);
- BLI_assert(sod->treedata_mesh.vert_normals != nullptr);
- BLI_assert(sod->treedata_mesh.loop != nullptr);
- BLI_assert(sod->treedata_mesh.looptri != nullptr);
- sod->has_looptris = true;
- }
+ BLI_assert(sod->treedata_mesh.vert != nullptr);
+ BLI_assert(sod->treedata_mesh.vert_normals != nullptr);
+ BLI_assert(sod->treedata_mesh.loop != nullptr);
+ BLI_assert(sod->treedata_mesh.looptri != nullptr);
+ BLI_assert(sod->has_looptris == false);
+
+ sod->has_looptris = sod->treedata_mesh.tree != nullptr;
/* Required for snapping with occlusion. */
sod->treedata_mesh.edge = me_eval->medge;
More information about the Bf-blender-cvs
mailing list