Merging r49834 through r49839 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / space_clip / space_clip.c
index 39ad2465a483fdcfaf5bbe277f328eab7e28ff44..3da9f1b018f318392bc55465f1b4fe512ad23875 100644 (file)
@@ -444,6 +444,7 @@ static void clip_operatortypes(void)
        WM_operatortype_append(CLIP_OT_change_frame);
        WM_operatortype_append(CLIP_OT_rebuild_proxy);
        WM_operatortype_append(CLIP_OT_mode_set);
+       WM_operatortype_append(CLIP_OT_view_ndof);
 
        /* ** clip_toolbar.c ** */
        WM_operatortype_append(CLIP_OT_tools);
@@ -608,6 +609,9 @@ static void clip_keymap(struct wmKeyConfig *keyconf)
 
        WM_keymap_add_item(keymap, "CLIP_OT_view_selected", PADPERIOD, KM_PRESS, 0, 0);
 
+       WM_keymap_add_item(keymap, "CLIP_OT_view_all", NDOF_BUTTON_FIT, KM_PRESS, 0, 0);
+       WM_keymap_add_item(keymap, "CLIP_OT_view_ndof", NDOF_MOTION, 0, 0, 0);
+
        /* jump to special frame */
        kmi = WM_keymap_add_item(keymap, "CLIP_OT_frame_jump", LEFTARROWKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
        RNA_enum_set(kmi->ptr, "position", 0);