diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
| commit | 080cf9332bc9d71e0e14326bc8efdf06b738dea1 (patch) | |
| tree | e8531a509dca4d8253aa19d89edc68152421f9e5 /source/blender/editors/space_action/action_intern.h | |
| parent | 6d495cc4ef071171ff0686b2be898a41e05b8051 (diff) | |
| parent | 9676642cc94599b3419c9aaa5cf1aae2fbbd235f (diff) | |
Merge branch 'gooseberry' into temp_motionpathstemp_motionpaths
Conflicts:
source/blender/blenkernel/intern/object.c
Diffstat (limited to 'source/blender/editors/space_action/action_intern.h')
| -rw-r--r-- | source/blender/editors/space_action/action_intern.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/space_action/action_intern.h b/source/blender/editors/space_action/action_intern.h index 61d4249ae20..17f1f404225 100644 --- a/source/blender/editors/space_action/action_intern.h +++ b/source/blender/editors/space_action/action_intern.h @@ -35,10 +35,7 @@ struct bContext; struct bAnimContext; struct SpaceAction; struct ARegion; -struct wmWindowManager; struct wmOperatorType; -struct ActKeysInc; -struct bAnimListElem; /* internal exports only */ @@ -80,6 +77,7 @@ enum eActKeys_ColumnSelect_Mode { void ACTION_OT_previewrange_set(struct wmOperatorType *ot); void ACTION_OT_view_all(struct wmOperatorType *ot); void ACTION_OT_view_selected(struct wmOperatorType *ot); +void ACTION_OT_view_frame(struct wmOperatorType *ot); void ACTION_OT_copy(struct wmOperatorType *ot); void ACTION_OT_paste(struct wmOperatorType *ot); @@ -101,10 +99,15 @@ void ACTION_OT_snap(struct wmOperatorType *ot); void ACTION_OT_mirror(struct wmOperatorType *ot); void ACTION_OT_new(struct wmOperatorType *ot); +void ACTION_OT_unlink(struct wmOperatorType *ot); + void ACTION_OT_push_down(struct wmOperatorType *ot); void ACTION_OT_stash(struct wmOperatorType *ot); void ACTION_OT_stash_and_create(struct wmOperatorType *ot); +void ACTION_OT_layer_next(struct wmOperatorType *ot); +void ACTION_OT_layer_prev(struct wmOperatorType *ot); + void ACTION_OT_markers_make_local(struct wmOperatorType *ot); /* defines for snap keyframes |