Revision: 19112
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19112
Author: aligorith
Date: 2009-02-25 11:55:03 +0100 (Wed, 25 Feb 2009)
Log Message:
-----------
Outliner/Datablocks view: IKEY/Alt-IKEY Hotkeys work for Inserting/Deleting
keyframes via KeyingSets
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_ops.c
Modified:
branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
2009-02-25 10:27:08 UTC (rev 19111)
+++ branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
2009-02-25 10:55:03 UTC (rev 19112)
@@ -2224,6 +2224,34 @@
return success;
}
+
+/* Polling callback for use with ANIM_*_keyframe() operators
+ * This is based on the standard ED_operator_areaactive callback,
+ * except that it does special checks for a few spacetypes too...
+ */
+static int modify_key_op_poll(bContext *C)
+{
+ ScrArea *sa= CTX_wm_area(C);
+ Scene *scene= CTX_data_scene(C);
+
+ /* if no area or active scene */
+ if (ELEM(NULL, sa, scene))
+ return 0;
+
+ /* if Outliner, only allow in DataBlocks view */
+ if (sa->spacetype == SPACE_OOPS) {
+ SpaceOops *so= (SpaceOops *)CTX_wm_space_data(C);
+
+ if ((so->type != SO_OUTLINER) || (so->outlinevis !=
SO_DATABLOCKS))
+ return 0;
+ }
+
+ /* TODO: checks for other space types can be added here */
+
+ /* should be fine */
+ return 1;
+}
+
/* Insert Key Operator ------------------------ */
/* NOTE:
@@ -2232,7 +2260,7 @@
*
* -- Joshua Leung, Feb 2009
*/
-
+
static int insert_key_exec (bContext *C, wmOperator *op)
{
ListBase dsources = {NULL, NULL};
@@ -2275,7 +2303,7 @@
/* callbacks */
ot->exec= insert_key_exec;
- ot->poll= ED_operator_areaactive;
+ ot->poll= modify_key_op_poll;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -2332,9 +2360,8 @@
/* callbacks */
ot->exec= delete_key_exec;
+ ot->poll= modify_key_op_poll;
- ot->poll= ED_operator_areaactive;
-
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
}
Modified:
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_ops.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_ops.c
2009-02-25 10:27:08 UTC (rev 19111)
+++
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_ops.c
2009-02-25 10:55:03 UTC (rev 19112)
@@ -58,6 +58,8 @@
/* keying sets - only for databrowse */
WM_keymap_verify_item(keymap, "OUTLINER_OT_keyingset_add_selected",
KKEY, KM_PRESS, 0, 0);
WM_keymap_verify_item(keymap, "OUTLINER_OT_keyingset_remove_selected",
KKEY, KM_PRESS, KM_ALT, 0);
-
+
+ WM_keymap_verify_item(keymap, "ANIM_OT_insert_keyframe", IKEY,
KM_PRESS, 0, 0);
+ WM_keymap_verify_item(keymap, "ANIM_OT_delete_keyframe", IKEY,
KM_PRESS, KM_ALT, 0);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
