diff options
| author | Joshua Leung <aligorith@gmail.com> | 2008-03-03 13:43:46 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2008-03-03 13:43:46 +0300 |
| commit | e96c1aa50780885eaf0efd9fac8c6b2f4c173f75 (patch) | |
| tree | 1df9bb44381de423b5766ecc7e46e40057fe2f49 /source | |
| parent | 81b9036fbfc4a219ad9fd7ae1debbf516ea86190 (diff) | |
Bugfix:
Constraint Channel keyframes are now transformed when they appear in Action Channel Group summaries.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/editaction.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c index b9bd1ca01a0..307f5259812 100644 --- a/source/blender/src/editaction.c +++ b/source/blender/src/editaction.c @@ -332,8 +332,11 @@ static void actdata_filter_actionchannel (ListBase *act_data, bActionChannel *ac } /* check if expanded - if not, continue on to next action channel */ - if (EXPANDED_ACHAN(achan) == 0 && (filter_mode & ACTFILTER_ONLYICU)==0) - return; + if (EXPANDED_ACHAN(achan) == 0 && (filter_mode & ACTFILTER_ONLYICU)==0) { + /* only exit if we don't need to include constraint channels for group-channel keyframes */ + if ( !(filter_mode & ACTFILTER_IPOKEYS) || (achan->grp == NULL) || (EXPANDED_AGRP(achan->grp)==0) ) + return; + } /* ipo channels */ if ((achan->ipo) && (filter_mode & ACTFILTER_IPOKEYS)==0) { |