kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Snapping

Browse Source 
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.
This commit is contained in:
Martin Poirier 2008-06-16 16:48:09 +00:00
parent 1e3bdcf198
commit bb539ce1b5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/src/transform_snap.c
View File

@ -1056,14 +1056,13 @@ int snapObjects(int *dist, float *loc, float *no, int mode) {
if (mode == NOT_ACTIVE) if (mode == NOT_ACTIVE)
{ {
DerivedMesh *dm, *dm_cage; DerivedMesh *dm;
Object *ob = G.obedit; 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); retval = snapDerivedMesh(ob, dm, ob->obmat, ray_start, ray_normal, mval, loc, no, dist, &depth, 1);
dm_cage->release(dm_cage);
dm->release(dm); dm->release(dm);
} }