diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-02-25 20:40:03 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-02-25 20:40:03 +0300 |
| commit | b334be110d0fc92f27e1bbae1e17675b14d45e57 (patch) | |
| tree | 663e9f4f5d698bd2a8f88280ed4b159309c5e40b /source/blender/src/toolbox.c | |
| parent | e13933bc7ca3879946df2a079a5fe47b0b217ae2 (diff) | |
New transform:
- added texture space grab/scale (TKEY objectmode)
- made new transform work with menus (meaning, dropping dreaded while-hold)
To Martin & other while-hold lovers: this needs to be carefully thought over
and designed. I prefer to look on this within context of making transform
fully tablet/pen friendly, as option. Aim now for me is still: get transform
back to work! :)
Diffstat (limited to 'source/blender/src/toolbox.c')
| -rw-r--r-- | source/blender/src/toolbox.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c index 37406eafcf9..8dd2804a2fa 100644 --- a/source/blender/src/toolbox.c +++ b/source/blender/src/toolbox.c @@ -75,12 +75,7 @@ #include "BKE_global.h" #include "BKE_main.h" -#include "BIF_gl.h" -#include "BIF_graphics.h" -#include "BIF_mainqueue.h" -#include "BIF_interface.h" -#include "BIF_toolbox.h" -#include "BIF_mywindow.h" +#include "BIF_editnla.h" #include "BIF_editarmature.h" #include "BIF_editdeform.h" #include "BIF_editfont.h" @@ -89,11 +84,17 @@ #include "BIF_editlattice.h" #include "BIF_editsima.h" #include "BIF_editoops.h" +#include "BIF_gl.h" +#include "BIF_graphics.h" #include "BIF_imasel.h" +#include "BIF_mainqueue.h" +#include "BIF_interface.h" +#include "BIF_toolbox.h" +#include "BIF_mywindow.h" #include "BIF_screen.h" #include "BIF_space.h" #include "BIF_tbcallback.h" -#include "BIF_editnla.h" +#include "BIF_transform.h" #include "BDR_editobject.h" #include "BDR_editcurve.h" @@ -1987,13 +1988,13 @@ static void tb_do_transform(void *arg, int event) switch(event) { case 0: /* Grab/move */ - transform('g'); + Transform(TFM_TRANSLATION); break; case 1: /* Rotate */ - transform('r'); + Transform(TFM_ROTATION); break; case 2: /* Scale */ - transform('s'); + Transform(TFM_RESIZE); break; case 3: /* transform properties */ add_blockhandler(curarea, VIEW3D_HANDLER_OBJECT, UI_PNL_UNSTOW); @@ -2005,7 +2006,7 @@ static void tb_do_transform(void *arg, int event) transform('N'); break; case 6: /* Shear */ - transform('S'); + Transform(TFM_SHEAR); break; case 7: /* Warp */ transform('w'); |