diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-07-24 12:05:56 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-07-24 12:05:56 +0400 |
| commit | b2606534b6d19c149a17fabc99dc0a5cbc8f2a52 (patch) | |
| tree | bbc124dff8a2638d15508ca5e23847dcf542d1d4 /source/blender/editors/animation | |
| parent | dbd5c5b8a13795a32f6d5bb1f4ae3c2b89058b47 (diff) | |
2.5 - Timeline window now displays keyframe lines again
* Keyframes for scene-linked animdata is drawn first (if 'Only Selected Data Keys' is off)
* Keyframes are also drawn for the active object
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_ops.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/animation/keyframing.c | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c index 73a1c934d97..7107639b036 100644 --- a/source/blender/editors/animation/anim_ops.c +++ b/source/blender/editors/animation/anim_ops.c @@ -386,10 +386,10 @@ void ED_operatortypes_anim(void) WM_operatortype_append(ANIM_OT_insert_keyframe); WM_operatortype_append(ANIM_OT_delete_keyframe); WM_operatortype_append(ANIM_OT_insert_keyframe_menu); - //WM_operatortype_append(ANIM_OT_delete_keyframe_menu); + WM_operatortype_append(ANIM_OT_delete_keyframe_v3d); WM_operatortype_append(ANIM_OT_insert_keyframe_button); WM_operatortype_append(ANIM_OT_delete_keyframe_button); - WM_operatortype_append(ANIM_OT_delete_keyframe_old); // xxx remove? + WM_operatortype_append(ANIM_OT_add_driver_button); WM_operatortype_append(ANIM_OT_remove_driver_button); diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index a6f379a9eed..60d0aa2c7bd 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -1223,7 +1223,7 @@ void ANIM_OT_delete_keyframe (wmOperatorType *ot) * -- Joshua Leung, Jan 2009 */ -static int delete_key_old_exec (bContext *C, wmOperator *op) +static int delete_key_v3d_exec (bContext *C, wmOperator *op) { Scene *scene= CTX_data_scene(C); float cfra= (float)CFRA; // XXX for now, don't bother about all the yucky offset crap @@ -1261,15 +1261,15 @@ static int delete_key_old_exec (bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void ANIM_OT_delete_keyframe_old (wmOperatorType *ot) +void ANIM_OT_delete_keyframe_v3d (wmOperatorType *ot) { /* identifiers */ ot->name= "Delete Keyframe"; - ot->idname= "ANIM_OT_delete_keyframe_old"; + ot->idname= "ANIM_OT_delete_keyframe_v3d"; /* callbacks */ ot->invoke= WM_operator_confirm; - ot->exec= delete_key_old_exec; + ot->exec= delete_key_v3d_exec; ot->poll= ED_operator_areaactive; @@ -1347,7 +1347,7 @@ static int insert_key_button_exec (bContext *C, wmOperator *op) void ANIM_OT_insert_keyframe_button (wmOperatorType *ot) { /* identifiers */ - ot->name= "Insert Keyframe"; + ot->name= "Insert Keyframe (Buttons)"; ot->idname= "ANIM_OT_insert_keyframe_button"; /* callbacks */ @@ -1355,7 +1355,7 @@ void ANIM_OT_insert_keyframe_button (wmOperatorType *ot) ot->poll= modify_key_op_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag= OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "all", 1, "All", "Insert a keyframe for all element of the array."); @@ -1417,7 +1417,7 @@ static int delete_key_button_exec (bContext *C, wmOperator *op) void ANIM_OT_delete_keyframe_button (wmOperatorType *ot) { /* identifiers */ - ot->name= "Delete Keyframe"; + ot->name= "Delete Keyframe (Buttons)"; ot->idname= "ANIM_OT_delete_keyframe_button"; /* callbacks */ @@ -1425,7 +1425,7 @@ void ANIM_OT_delete_keyframe_button (wmOperatorType *ot) ot->poll= modify_key_op_poll; /* flags */ - ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; + ot->flag= OPTYPE_UNDO; /* properties */ RNA_def_boolean(ot->srna, "all", 1, "All", "Delete keyfames from all elements of the array."); |