[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15243] trunk/blender/source/blender/src/ transform_snap.c: Snapping

[Martin Poirier]

Revision: 15243
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15243
Author:   theeth
Date:     2008-06-16 18:48:09 +0200 (Mon, 16 Jun 2008)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/src/transform_snap.c

Modified: trunk/blender/source/blender/src/transform_snap.c
===================================================================
--- trunk/blender/source/blender/src/transform_snap.c	2008-06-16 14:08:24 UTC (rev 15242)
+++ trunk/blender/source/blender/src/transform_snap.c	2008-06-16 16:48:09 UTC (rev 15243)
@@ -1056,14 +1056,13 @@
 
 	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);
 	}