* Made the "mini axis" draw with lines proportional to it's size. Currently, the...
authorJoshua Leung <aligorith@gmail.com>
Thu, 24 Jan 2008 00:03:16 +0000 (00:03 +0000)
committerJoshua Leung <aligorith@gmail.com>
Thu, 24 Jan 2008 00:03:16 +0000 (00:03 +0000)
* Fixed bug with IPO-transform. When "Switch Mouse Buttons" is on, click-drag transforms of keys didn't work.

source/blender/src/drawview.c
source/blender/src/editipo.c

index e3d73f4cda351f013a0ced615aafc75feaf8031e..c7955fda2fccd21f336a3944f28d70244440e5fc 100644 (file)
@@ -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);
 }
 
        
index 3963103a168515c881935ac1fb4bcd295c9ad509..6fe2e032eed7202f5e7c2730fb26613a5e0b122c 100644 (file)
@@ -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) {