[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13506] trunk/blender/source/blender/src: Action Editor Bugs/Regressions:
Joshua Leung
aligorith at gmail.com
Thu Jan 31 23:47:03 CET 2008
Revision: 13506
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13506
Author: aligorith
Date: 2008-01-31 23:47:03 +0100 (Thu, 31 Jan 2008)
Log Message:
-----------
Action Editor Bugs/Regressions:
* Insert Key and Column Select should be working again
* Last channel in group's keyframes now appear in summary too
Modified Paths:
--------------
trunk/blender/source/blender/src/drawaction.c
trunk/blender/source/blender/src/editaction.c
Modified: trunk/blender/source/blender/src/drawaction.c
===================================================================
--- trunk/blender/source/blender/src/drawaction.c 2008-01-31 21:19:40 UTC (rev 13505)
+++ trunk/blender/source/blender/src/drawaction.c 2008-01-31 22:47:03 UTC (rev 13506)
@@ -1419,7 +1419,7 @@
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);
Modified: trunk/blender/source/blender/src/editaction.c
===================================================================
--- trunk/blender/source/blender/src/editaction.c 2008-01-31 21:19:40 UTC (rev 13505)
+++ trunk/blender/source/blender/src/editaction.c 2008-01-31 22:47:03 UTC (rev 13506)
@@ -326,9 +326,13 @@
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 @@
}
/* 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 */
More information about the Bf-blender-cvs
mailing list