diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2005-04-24 15:57:23 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2005-04-24 15:57:23 +0400 |
| commit | 0016d29b518f871bb88d9d9388b9a1d873b6d884 (patch) | |
| tree | 5f43a5ac8393600a24fe0095836132e2cf3b43b0 /source/blender/src/space.c | |
| parent | 6379ff9b7046e9286aaa117e98cdaa932480008c (diff) | |
Make view translation and zooming 'smooth' in the uv editor. Power-of-two
zoom levels can be found in the View > View Navigation menu. Also Ctrl+MMB
zooming was added.
Added the E-key, LSCM unwrap popup back again.
Diffstat (limited to 'source/blender/src/space.c')
| -rw-r--r-- | source/blender/src/space.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/source/blender/src/space.c b/source/blender/src/space.c index bde20a6048e..04f2687aa2b 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -3751,9 +3751,6 @@ static void winqreadimagespace(ScrArea *sa, void *spacedata, BWinEvent *evt) if(G.qual & LR_SHIFTKEY) mouseco_to_curtile(); else gesture(); break; - case MIDDLEMOUSE: - image_viewmove(); - break; case RIGHTMOUSE: if(G.f & G_FACESELECT) mouse_select_sima(); @@ -3779,7 +3776,8 @@ static void winqreadimagespace(ScrArea *sa, void *spacedata, BWinEvent *evt) toggle_uv_select('f'); break; case EKEY : - unwrap_lscm(); + if(okee("LSCM Unwrap")) + unwrap_lscm(); break; case GKEY: if((G.qual==0)) @@ -3865,13 +3863,13 @@ static void winqreadimagespace(ScrArea *sa, void *spacedata, BWinEvent *evt) do_imagebuts(val); // drawimage.c break; case MIDDLEMOUSE: - image_viewmove(); + if((G.qual==LR_CTRLKEY) || ((U.flag & USER_TWOBUTTONMOUSE) && (G.qual==(LR_ALTKEY|LR_CTRLKEY)))) + image_viewmove(1); + else + image_viewmove(0); break; - case WHEELUPMOUSE: - case WHEELDOWNMOUSE: - case PADPLUSKEY: - case PADMINUS: - image_viewzoom(event); + case WHEELUPMOUSE: case WHEELDOWNMOUSE: case PADPLUSKEY: case PADMINUS: + image_viewzoom(event, 0); scrarea_queue_winredraw(curarea); break; case HOMEKEY: |