archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

only initialize snap from the scene settings for view3d and image spaces since snap in the 3D view was enabling snap in the graph editor and sequencer without a button to disable it in those spaces.

Browse Source
This commit is contained in:
Campbell Barton
2011-07-28 02:15:58 +00:00
parent 7e87165eea
commit a5631dba89
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/editors/transform/transform_snap.c
View File

@@ -467,14 +467,17 @@ void initSnapping(TransInfo *t, wmOperator *op)
/* use scene defaults only when transform is modal */ /* use scene defaults only when transform is modal */
else if (t->flag & T_MODAL) else if (t->flag & T_MODAL)
{ {
if (ts->snap_flag & SCE_SNAP) { if(ELEM(t->spacetype, SPACE_VIEW3D, SPACE_IMAGE))
t->modifiers |= MOD_SNAP; {
} if (ts->snap_flag & SCE_SNAP) {
t->modifiers |= MOD_SNAP;
}
t->tsnap.align = ((t->settings->snap_flag & SCE_SNAP_ROTATE) == SCE_SNAP_ROTATE); t->tsnap.align = ((t->settings->snap_flag & SCE_SNAP_ROTATE) == SCE_SNAP_ROTATE);
t->tsnap.project = ((t->settings->snap_flag & SCE_SNAP_PROJECT) == SCE_SNAP_PROJECT); t->tsnap.project = ((t->settings->snap_flag & SCE_SNAP_PROJECT) == SCE_SNAP_PROJECT);
t->tsnap.snap_self = !((t->settings->snap_flag & SCE_SNAP_NO_SELF) == SCE_SNAP_NO_SELF); t->tsnap.snap_self = !((t->settings->snap_flag & SCE_SNAP_NO_SELF) == SCE_SNAP_NO_SELF);
t->tsnap.peel = ((t->settings->snap_flag & SCE_SNAP_PROJECT) == SCE_SNAP_PROJECT); t->tsnap.peel = ((t->settings->snap_flag & SCE_SNAP_PROJECT) == SCE_SNAP_PROJECT);
}
} }
t->tsnap.target = snap_target; t->tsnap.target = snap_target;