diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2019-08-06 11:10:21 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2019-08-06 14:28:20 +0300 |
| commit | 199c37d7e44776f382920632b334e9d21b06f6aa (patch) | |
| tree | eaa4051ab57d1facb11f991084a7c3a214f6881c | |
| parent | 45ae33a9524153376d1df66a69d7a162c28e336c (diff) | |
Fix T68291: crash snapping to both verts and edges with linked meshes
this was also happening in snapping with the measure tool
same method as in snap_mesh_polygon() (from rB59286ddcf80c) now used in
snap_mesh_edge_verts_mixed() as well...
Reviewers: mano-wii
Maniphest Tasks: T68291
Differential Revision: https://developer.blender.org/D5422
| -rw-r--r-- | source/blender/editors/transform/transform_snap_object.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 6f06f8639bd..3f17be605b2 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -1382,6 +1382,13 @@ static short snap_mesh_edge_verts_mixed(SnapObjectContext *sctx, }; SnapObjectData *sod = BLI_ghash_lookup(sctx->cache.object_map, ob); + if (sod == NULL) { + /* The object is in edit mode, and the key used + * was the object referenced in BMEditMesh */ + BMEditMesh *em = BKE_editmesh_from_object(ob); + sod = BLI_ghash_lookup(sctx->cache.object_map, em->ob); + } + BLI_assert(sod != NULL); if (sod->type == SNAP_MESH) { |