diff options
author | Joshua Leung <aligorith@gmail.com> | 2008-01-24 03:03:16 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2008-01-24 03:03:16 +0300 |
commit | 0d3c8ad238abe40657fdab9b08560aace94d4637 (patch) | |
tree | 4c42c5e69712d16b1bc4352b2a7bfd6bb83d97f7 /source/blender/src | |
parent | f1fcbd8f140d8e2a828cd666698bba54f809e6c8 (diff) |
* Made the "mini axis" draw with lines proportional to it's size. Currently, the thick lines are a bit too thick at larger sizes, but it's better than having slower viewports.
* Fixed bug with IPO-transform. When "Switch Mouse Buttons" is on, click-drag transforms of keys didn't work.
Diffstat (limited to 'source/blender/src')
-rw-r--r-- | source/blender/src/drawview.c | 8 | ||||
-rw-r--r-- | source/blender/src/editipo.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index e3d73f4cda3..c7955fda2fc 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -1409,6 +1409,11 @@ static void draw_view_axis(void) float dx, dy; float h, s, v; + /* thickness of lines is proportional to k */ + /* (log(k)-1) gives a more suitable thickness, but fps decreased by about 3 fps */ + glLineWidth(k / 10); + //glLineWidth(log(k)-1); // a bit slow + BIF_GetThemeColor3ubv(TH_GRID, (char *)gridcol); /* X */ @@ -1473,6 +1478,9 @@ static void draw_view_axis(void) glRasterPos2i(start + dx + 2, start + dy + ydisp + 2); BMF_DrawString(G.fonts, "z"); } + + /* restore line-width */ + glLineWidth(1.0); } diff --git a/source/blender/src/editipo.c b/source/blender/src/editipo.c index 3963103a168..6fe2e032eed 100644 --- a/source/blender/src/editipo.c +++ b/source/blender/src/editipo.c @@ -1660,7 +1660,7 @@ void mouse_select_ipo(void) xo= mval[0]; yo= mval[1]; - while(get_mbut()&R_MOUSE) { + while (get_mbut() & ((U.flag & USER_LMOUSESELECT)?L_MOUSE:R_MOUSE)) { getmouseco_areawin(mval); if(abs(mval[0]-xo)+abs(mval[1]-yo) > 4) { |