Revision: 14225
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14225
Author: aligorith
Date: 2008-03-24 12:25:34 +0100 (Mon, 24 Mar 2008)
Log Message:
-----------
Peach Request: Fix for little bug in Action Editor
Quick patch for action-filtering system, so that the IKEY (Insert Key) -> "Key
Only Selected" doesn't key in channels that are hidden. Documented the
convoulted logic there a bit.
Note: constraint channel keys in group channels seems to have become broken
again at some point before this commit
Modified Paths:
--------------
trunk/blender/source/blender/src/editaction.c
trunk/blender/source/blender/src/edittime.c
Modified: trunk/blender/source/blender/src/editaction.c
===================================================================
--- trunk/blender/source/blender/src/editaction.c 2008-03-24 09:00:39 UTC
(rev 14224)
+++ trunk/blender/source/blender/src/editaction.c 2008-03-24 11:25:34 UTC
(rev 14225)
@@ -418,9 +418,15 @@
/* filters here are a bit convoulted...
* - groups show a "summary" of keyframes beside
their name which must accessable for tools which handle keyframes
* - groups can be collapsed (and those tools
which are only interested in channels rely on knowing that group is closed)
+ *
+ * cases when we should include action-channels and
so-forth inside group:
+ * - we don't care about visibility
+ * - group is expanded
+ * - we're interested in keyframes, but not if
they appear in selected channels
*/
if ( (!(filter_mode & ACTFILTER_VISIBLE) ||
EXPANDED_AGRP(agrp)) ||
- (filter_mode &
(ACTFILTER_IPOKEYS|ACTFILTER_ONLYICU)) )
+ ( ((filter_mode & ACTFILTER_IPOKEYS) ||
(filter_mode & ACTFILTER_ONLYICU)) &&
+ !(filter_mode & ACTFILTER_SEL) ) )
{
if (!(filter_mode & ACTFILTER_FOREDIT) ||
EDITABLE_AGRP(agrp)) {
for (achan= agrp->channels.first; achan
&& achan->grp==agrp; achan= achan->next) {
Modified: trunk/blender/source/blender/src/edittime.c
===================================================================
--- trunk/blender/source/blender/src/edittime.c 2008-03-24 09:00:39 UTC (rev
14224)
+++ trunk/blender/source/blender/src/edittime.c 2008-03-24 11:25:34 UTC (rev
14225)
@@ -602,7 +602,6 @@
/* set the animation preview range of scene */
void anim_previewrange_set()
{
- extern float get_action_frame(Object *ob, float cframe);
rcti rect;
rctf rectf;
short val, mval[2];
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
