diff options
| author | Joshua Leung <aligorith@gmail.com> | 2008-02-01 01:47:03 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2008-02-01 01:47:03 +0300 |
| commit | 240148f36346bbcf5476799c27e9775fe3766597 (patch) | |
| tree | 767a67551823a044da365732f1a8872f6e2c7a82 /source | |
| parent | 37f7826ee1c418049296da6f886037fb23ec9ca0 (diff) | |
Action Editor Bugs/Regressions:
* Insert Key and Column Select should be working again
* Last channel in group's keyframes now appear in summary too
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/drawaction.c | 2 | ||||
| -rw-r--r-- | source/blender/src/editaction.c | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/src/drawaction.c b/source/blender/src/drawaction.c index aac13231c50..ea1a17f0b69 100644 --- a/source/blender/src/drawaction.c +++ b/source/blender/src/drawaction.c @@ -1419,7 +1419,7 @@ void agroup_to_keylist(bActionGroup *agrp, ListBase *keys, ListBase *blocks, Act if (agrp) { /* loop through action channels */ - for (achan= agrp->channels.first; achan && achan!=agrp->channels.last; achan= achan->next) { + for (achan= agrp->channels.first; achan && achan->grp==agrp; achan= achan->next) { /* firstly, add keys from action channel's ipo block */ if (achan->ipo) ipo_to_keylist(achan->ipo, keys, blocks, aki); diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c index 8dc16909193..0d48db79b8f 100644 --- a/source/blender/src/editaction.c +++ b/source/blender/src/editaction.c @@ -326,9 +326,13 @@ static void actdata_filter_actionchannel (ListBase *act_data, bActionChannel *ac if (ale) BLI_addtail(act_data, ale); } } + else { + /* for insert key... this check could be improved */ + return; + } /* check if expanded - if not, continue on to next action channel */ - if (EXPANDED_ACHAN(achan) == 0) + if (EXPANDED_ACHAN(achan) == 0 && (filter_mode & ACTFILTER_ONLYICU)==0) return; /* ipo channels */ @@ -360,7 +364,7 @@ static void actdata_filter_actionchannel (ListBase *act_data, bActionChannel *ac } /* add constraint channels? */ - if (FILTER_CON_ACHAN(achan)) { + if (FILTER_CON_ACHAN(achan) || (filter_mode & ACTFILTER_ONLYICU)) { /* loop through constraint channels, checking and adding them */ for (conchan=achan->constraintChannels.first; conchan; conchan=conchan->next) { /* only work with this channel and its subchannels if it is editable */ |