diff options
author | Joshua Leung <aligorith@gmail.com> | 2006-11-15 13:41:28 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2006-11-15 13:41:28 +0300 |
commit | a3c1c543f6e1bcb4a2151b6be0786247887bb14c (patch) | |
tree | 248af37ba99b823e28df5019e0a208c98c377818 /source/blender/blenkernel | |
parent | 95c7c41bd060a55fb2679d53635474dc69703ed7 (diff) |
== Action Editor ==
A Plumiferos wishlist item: Markers working in the Action Editor too.
* The user can choose between displaying the scene markers (i.e. the
markers shown in the timeline) or the markers specific to each action,
by using the next list box on the action editor header. This is specific
to each instance of the action editor.
* The display of the markers currently still needs improvement. At the
moment, the triangle icons + text are drawn below all the last row of
keyframes. As such, I've made it draw yellow vertical lines which
span the height of the action editor, to also indicate markers.
Comments on this and also help getting the triangle thingies to 'float'
above the bottom scroll bar are warmly appreciated.
* There are a few minor update issues with editing a marker in the
timeline and the markers in the action editor which will be fixed soon.
* There are also a few hotkeys to still add.
Enjoy!
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/action.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index 9f42e682e82..3ee6b89804c 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -176,6 +176,10 @@ void free_action(bAction *act) free_constraint_channels(&chan->constraintChannels); } + /* Free markers */ + if (act->markers.first) + BLI_freelistN (&act->markers); + if (act->chanbase.first) BLI_freelistN (&act->chanbase); } @@ -189,6 +193,7 @@ bAction* copy_action(bAction *src) dst= copy_libblock(src); duplicatelist(&(dst->chanbase), &(src->chanbase)); + duplicatelist(&(dst->markers), &(src->markers)); for (dchan=dst->chanbase.first, schan=src->chanbase.first; dchan; dchan=dchan->next, schan=schan->next){ dchan->ipo = copy_ipo(dchan->ipo); |