Revision: 38773
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38773
Author:   campbellbarton
Date:     2011-07-28 02:15:58 +0000 (Thu, 28 Jul 2011)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform_snap.c

Modified: trunk/blender/source/blender/editors/transform/transform_snap.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_snap.c     
2011-07-28 01:38:48 UTC (rev 38772)
+++ trunk/blender/source/blender/editors/transform/transform_snap.c     
2011-07-28 02:15:58 UTC (rev 38773)
@@ -467,14 +467,17 @@
        /* use scene defaults only when transform is modal */
        else if (t->flag & T_MODAL)
        {
-               if (ts->snap_flag & SCE_SNAP) {
-                       t->modifiers |= MOD_SNAP;
+               if(ELEM(t->spacetype, SPACE_VIEW3D, SPACE_IMAGE))
+               {
+                       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.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.peel = ((t->settings->snap_flag & 
SCE_SNAP_PROJECT) == SCE_SNAP_PROJECT);
                }
-
-               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.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.target = snap_target;

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to