[Bf-blender-cvs] [bec057a4531] master: Fix assert on meshes without mloop in snap code

Germano Cavalcante noreply at git.blender.org
Mon Apr 18 23:26:32 CEST 2022


Commit: bec057a4531dfc2c6986ffdcb6f8723b8a6d3c34
Author: Germano Cavalcante
Date:   Mon Apr 18 17:03:26 2022 -0300
Branches: master
https://developer.blender.org/rBbec057a4531dfc2c6986ffdcb6f8723b8a6d3c34

Fix assert on meshes without mloop in snap code

Meshes without loops are still valid for snapping.

===================================================================

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 c3168b58c47..d0c0d141f15 100644
--- a/source/blender/editors/transform/transform_snap_object.cc
+++ b/source/blender/editors/transform/transform_snap_object.cc
@@ -312,10 +312,10 @@ static SnapObjectData *snap_object_data_mesh_get(SnapObjectContext *sctx,
                               use_hide ? BVHTREE_FROM_LOOPTRI_NO_HIDDEN : BVHTREE_FROM_LOOPTRI,
                               4);
 
-    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->treedata_mesh.vert == me_eval->mvert);
+    BLI_assert(!me_eval->mvert || sod->treedata_mesh.vert_normals);
+    BLI_assert(sod->treedata_mesh.loop == me_eval->mloop);
+    BLI_assert(!me_eval->mpoly || sod->treedata_mesh.looptri);
     BLI_assert(sod->has_looptris == false);
 
     sod->has_looptris = sod->treedata_mesh.tree != nullptr;



More information about the Bf-blender-cvs mailing list