diff options
| author | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-12-17 16:01:32 +0300 |
|---|---|---|
| committer | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-12-17 16:01:32 +0300 |
| commit | dbc41b30f88b96f7d8c6e995b17f5930eb55cc77 (patch) | |
| tree | c6c495328443ea3621e5df2ef483b0e0dd504496 /source/blender/makesdna/DNA_action_types.h | |
| parent | 99a2af76d10e05a18987be5d554ada197b1ca086 (diff) | |
| parent | 7c9e4099854a4fc8eab4db97173c1aacd25f9e08 (diff) | |
Merge branch 'master' into soc-2021-uv-edge-select-supportsoc-2021-uv-edge-select-support
Diffstat (limited to 'source/blender/makesdna/DNA_action_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_action_types.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h index e899e6bd3ec..8e7551e1703 100644 --- a/source/blender/makesdna/DNA_action_types.h +++ b/source/blender/makesdna/DNA_action_types.h @@ -682,6 +682,10 @@ typedef struct bAction { int idroot; char _pad[4]; + /** Start and end of the manually set intended playback frame range. Used by UI and + * some editing tools, but doesn't directly affect animation evaluation in any way. */ + float frame_start, frame_end; + PreviewImage *preview; } bAction; @@ -695,6 +699,10 @@ typedef enum eAction_Flags { ACT_MUTED = (1 << 9), /* ACT_PROTECTED = (1 << 10), */ /* UNUSED */ /* ACT_DISABLED = (1 << 11), */ /* UNUSED */ + /** The action has a manually set intended playback frame range. */ + ACT_FRAME_RANGE = (1 << 12), + /** The action is intended to be a cycle (requires ACT_FRAME_RANGE). */ + ACT_CYCLIC = (1 << 13), } eAction_Flags; /* ************************************************ */ |