diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-12 15:17:42 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-12 15:17:42 +0400 |
| commit | 41a66025478aab8811eb47f6d1f16ede11de9349 (patch) | |
| tree | 97272297f381d0fcb08b8796913d88ba39e53ecb /source/blender/editors | |
| parent | fa39db244148911f04fd4de52425258248b8eb91 (diff) | |
2.5: remove user preferences to always snap for translate/rotate/scale,
with new behavior of the snap setting in the 3d view these are no longer
necessary.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/transform/transform_snap.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 9d8057caea6..bfa9c0c1e2c 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -1897,26 +1897,13 @@ void snapGridAction(TransInfo *t, float *val, GearsType action) { void snapGrid(TransInfo *t, float *val) { - int invert; GearsType action; // Only do something if using Snap to Grid if (t->tsnap.mode != SCE_SNAP_MODE_INCREMENT) return; - if(t->mode==TFM_ROTATION || t->mode==TFM_WARP || t->mode==TFM_TILT || t->mode==TFM_TRACKBALL || t->mode==TFM_BONE_ROLL) - invert = U.flag & USER_AUTOROTGRID; - else if(t->mode==TFM_RESIZE || t->mode==TFM_SHEAR || t->mode==TFM_BONESIZE || t->mode==TFM_SHRINKFATTEN || t->mode==TFM_CURVE_SHRINKFATTEN) - invert = U.flag & USER_AUTOSIZEGRID; - else - invert = U.flag & USER_AUTOGRABGRID; - - if(invert) { - action = activeSnap(t) ? NO_GEARS: BIG_GEARS; - } - else { - action = activeSnap(t) ? BIG_GEARS : NO_GEARS; - } + action = activeSnap(t) ? BIG_GEARS : NO_GEARS; if (action == BIG_GEARS && (t->modifiers & MOD_PRECISION)) { action = SMALL_GEARS; |