soc-2008-mxcurioni: merged changes to revision 15163
[blender-staging.git] / source / blender / src / space.c
index 8cc7e6975b4686c6410a3a90b2b67ec474508fc4..f3d0d4f715ac1f6d856751235ea79a01b6cb5ffa 100644 (file)
@@ -4922,7 +4922,7 @@ static void winqreadseqspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
                        break;
                case HOMEKEY:
                        if((G.qual==0))
-                               seq_home();
+                               do_seq_buttons(B_SEQHOME);
                        break;
                case PADPERIOD: 
                        if(last_seq) {
@@ -5072,10 +5072,8 @@ static void winqreadseqspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
                case HKEY: /* hide==mute? - not that nice but MKey us used for meta :/ */
                        if((G.qual==0)) {
                                seq_mute_sel(1);
-                       } else if(G.qual==LR_ALTKEY) {
+                       } else if((G.qual==LR_ALTKEY)) {
                                seq_mute_sel(0);
-                       } else if(G.qual==LR_SHIFTKEY) {
-                               seq_mute_sel(-1);
                        }
                        break;
                case XKEY:
@@ -5086,11 +5084,7 @@ static void winqreadseqspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
                                        del_seq();
                        }
                        break;
-               case PAD1: case PAD2: case PAD4: case PAD8:
-                       seq_viewzoom(event, (G.qual & LR_SHIFTKEY)==0);
-                       doredraw= 1;
-                       break;
-               }       
+               }
        }
 
        if(doredraw) scrarea_queue_winredraw(curarea);