diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-07-19 09:20:30 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-07-19 09:20:30 +0400 |
commit | 388af9d827ccae97f24c6d65f7ab2da22ee8ea79 (patch) | |
tree | a36826a6366cc9d79a8ef37100ff834dd493c3f0 /source | |
parent | 7411a86a41c654ff0ea6769a8130707a6baadac4 (diff) |
2.5 - Warning Fixes + Hotkey for Reversed Playback
Reversed playback can now be activated using the Alt-Shift-A hotkey. It works the same way that the Alt-A playback operator works.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/armature/poselib.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/editconstraint.c | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 13 |
3 files changed, 12 insertions, 5 deletions
diff --git a/source/blender/editors/armature/poselib.c b/source/blender/editors/armature/poselib.c index d0a99e4ad13..ef2e5188487 100644 --- a/source/blender/editors/armature/poselib.c +++ b/source/blender/editors/armature/poselib.c @@ -270,7 +270,7 @@ void poselib_validate_act (bAction *act) } /* free temp memory */ - BLI_freelistN(&keys); + BLI_freelistN((ListBase *)&keys); BIF_undo_push("PoseLib Validate Action"); } diff --git a/source/blender/editors/object/editconstraint.c b/source/blender/editors/object/editconstraint.c index 62bc5d13257..f5feccb8e4c 100644 --- a/source/blender/editors/object/editconstraint.c +++ b/source/blender/editors/object/editconstraint.c @@ -1091,7 +1091,7 @@ static int pose_constraint_add_exec(bContext *C, wmOperator *op) Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data; if(!ob) - return OPERATOR_CANCELLED;; + return OPERATOR_CANCELLED; return constraint_add_exec(C, op, get_active_constraints(ob)); } diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 812c9f11069..05f5d847159 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -2880,7 +2880,10 @@ void ED_operatortypes_screen(void) /* called in spacetypes.c */ void ED_keymap_screen(wmWindowManager *wm) { - ListBase *keymap= WM_keymap_listbase(wm, "Screen", 0, 0); + ListBase *keymap; + + /* Screen General ------------------------------------------------ */ + keymap= WM_keymap_listbase(wm, "Screen", 0, 0); /* standard timers */ WM_keymap_add_item(keymap, "SCREEN_OT_animation_step", TIMER0, KM_ANY, KM_ANY, 0); @@ -2933,13 +2936,17 @@ void ED_keymap_screen(wmWindowManager *wm) WM_keymap_add_item(keymap, "SCREEN_OT_render_view_cancel", ESCKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "SCREEN_OT_render_view_show", F11KEY, KM_PRESS, 0, 0); - /* frame offsets & play */ + /* Anim Playback ------------------------------------------------ */ keymap= WM_keymap_listbase(wm, "Frames", 0, 0); + + /* frame offsets */ RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_offset", UPARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", 10); RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_offset", DOWNARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", -10); RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_offset", LEFTARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", -1); RNA_int_set(WM_keymap_add_item(keymap, "SCREEN_OT_frame_offset", RIGHTARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", 1); - WM_keymap_add_item(keymap, "SCREEN_OT_animation_play", AKEY, KM_PRESS, KM_ALT, 0); + /* play (forward and backwards) */ + WM_keymap_add_item(keymap, "SCREEN_OT_animation_play", AKEY, KM_PRESS, KM_ALT, 0); + RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_animation_play", AKEY, KM_PRESS, KM_ALT|KM_SHIFT, 0)->ptr, "reverse", 1); } |