From bb539ce1b5171fb2b34379655071054905c802cf Mon Sep 17 00:00:00 2001 From: Martin Poirier Date: Mon, 16 Jun 2008 16:48:09 +0000 Subject: [PATCH] Snapping Snap to cage only in edit mode (respect the edit cage flag of modifiers). Especially important for subsurf, otherwise, Andy's automerge + snap video doesn't work in current SVN. --- source/blender/src/transform_snap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source/blender/src/transform_snap.c b/source/blender/src/transform_snap.c index 3a1017915f9..405b512bb5d 100644 --- a/source/blender/src/transform_snap.c +++ b/source/blender/src/transform_snap.c @@ -1056,14 +1056,13 @@ int snapObjects(int *dist, float *loc, float *no, int mode) { if (mode == NOT_ACTIVE) { - DerivedMesh *dm, *dm_cage; + DerivedMesh *dm; Object *ob = G.obedit; - dm_cage = editmesh_get_derived_cage_and_final(&dm, CD_MASK_BAREMESH); + dm = editmesh_get_derived_cage(CD_MASK_BAREMESH); retval = snapDerivedMesh(ob, dm, ob->obmat, ray_start, ray_normal, mval, loc, no, dist, &depth, 1); - dm_cage->release(dm_cage); dm->release(dm); }