diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-12-19 21:56:08 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-12-19 21:56:08 +0300 |
| commit | 72d805f17d5e7732cf37c70c1ae732efd5d509c2 (patch) | |
| tree | 69640121e30ca61b5c120a146c8f397a17839ae8 /source/blender/src/transform_generics.c | |
| parent | 75a227e62009d8fb29f5bd7984ce82dcc4e68797 (diff) | |
| parent | c1a2851c0d791f3e041ec6d33747cd056919b6ad (diff) | |
Orange: monday merger with bf-blender (loadsa bugfixes).
ALso: a bit tidying up in editaction.c and python Object.c
Diffstat (limited to 'source/blender/src/transform_generics.c')
| -rwxr-xr-x | source/blender/src/transform_generics.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/src/transform_generics.c b/source/blender/src/transform_generics.c index d88a128cdb7..cfd7223c1c1 100755 --- a/source/blender/src/transform_generics.c +++ b/source/blender/src/transform_generics.c @@ -492,11 +492,18 @@ void postTrans (TransInfo *t) static void apply_grid3(TransInfo *t, float *val, int max_index, float fac1, float fac2, float fac3) { /* fac1 is for 'nothing', fac2 for CTRL, fac3 for SHIFT */ - int invert = U.flag & USER_AUTOGRABGRID; + int invert; int ctrl; int i; float asp= 1.0f; + if(t->mode==TFM_ROTATION || t->mode==TFM_WARP || t->mode==TFM_TILT || t->mode==TFM_TRACKBALL) + invert = U.flag & USER_AUTOROTGRID; + else if(t->mode==TFM_RESIZE || t->mode==TFM_SHEAR || t->mode==TFM_BONESIZE || t->mode==TFM_SHRINKFATTEN) + invert = U.flag & USER_AUTOSIZEGRID; + else + invert = U.flag & USER_AUTOGRABGRID; + for (i=0; i<=max_index; i++) { /* evil hack - snapping needs to be adapted for image aspect ratio */ |