[Bf-blender-cvs] [cb42850ef25] blender2.8: Fix assert in snapEditMesh.
mano-wii
noreply at git.blender.org
Thu Jul 26 18:48:46 CEST 2018
Commit: cb42850ef25ab023a7d4a346a438148c42cb89c9
Author: mano-wii
Date: Thu Jul 26 13:48:26 2018 -0300
Branches: blender2.8
https://developer.blender.org/rBcb42850ef25ab023a7d4a346a438148c42cb89c9
Fix assert in snapEditMesh.
===================================================================
M source/blender/editors/transform/transform_snap_object.c
===================================================================
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c
index 8b2b80a4239..a6e857c4a60 100644
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -537,6 +537,8 @@ static bool raycastEditMesh(
BVHTreeFromEditMesh *treedata = NULL;
Object *em_ob = em->ob;
+ BLI_assert(em_ob->data == BKE_object_get_pre_modified_mesh(ob));
+
void **sod_p;
/* Use `em->ob` as the key in ghash since the editmesh is used
* to create bvhtree and is the same for each linked object. */
@@ -2055,7 +2057,7 @@ static short snapEditMesh(
BVHTreeFromEditMesh *treedata_vert = NULL, *treedata_edge = NULL;
Object *em_ob = em->ob;
- BLI_assert(em_ob->data == ob->data);
+ BLI_assert(em_ob->data == BKE_object_get_pre_modified_mesh(ob));
UNUSED_VARS_NDEBUG(ob);
void **sod_p;
More information about the Bf-blender-cvs
mailing list