diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-05-22 05:16:26 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-05-22 05:16:26 +0400 |
| commit | 9b1ce6e55608e868a1fa1bc62710e053919c39de (patch) | |
| tree | 1b9da9a2767f43ffbd590ce591d1edfc5e4f41be /source/blender/makesdna/DNA_anim_types.h | |
| parent | cebf6cb22deb930f5ec235e81c20072bf7154a83 (diff) | |
NLA SoC: Part 1 of NLA-Data Management API
In this commit:
* Added code for freeing NLA data now stored in AnimData
* Started writing some utilities for adding NLA data, especially the 'push-down' concept for Actions
* Cleanups of existing code - removal of obsolete NLA code from various places
Next commits/parts:
* File IO code for new-style NLA data
* Version patching for old data to new data
Diffstat (limited to 'source/blender/makesdna/DNA_anim_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_anim_types.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index c0cdc1ab589..b20ec7ba37f 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -395,7 +395,7 @@ typedef struct AnimMapper { typedef struct NlaStrip { struct NlaStrip *next, *prev; - bAction *act; /* Action that is referenced by this strip */ + bAction *act; /* Action that is referenced by this strip (strip is 'user' of the action) */ AnimMapper *remap; /* Remapping info this strip (for tweaking correspondance of action with context) */ ListBase fcurves; /* F-Curves for controlling this strip's influence and timing */ // TODO: move out? @@ -458,6 +458,8 @@ enum { /* NLA strip is muted (i.e. doesn't contribute in any way) */ // TODO: this overlaps a lot with the functionality in track NLASTRIP_FLAG_MUTED = (1<<12), + /* NLA strip length is synced to the length of the referenced action */ + NLASTRIP_FLAG_SYNC_LENGTH = (1<<13), } eNlaStrip_Flag; /* NLA Strip Type */ |