sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Peach Request: Fix for little bug in Action Editor

Browse Source 
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
This commit is contained in:
Joshua Leung 2008-03-24 11:25:34 +00:00
parent dbd64ac751
commit 186320f458
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/src/editaction.c
View File

@ -418,9 +418,15 @@ static void actdata_filter_action (ListBase *act_data, bAction *act, int filter_
/* 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) {

1
source/blender/src/edittime.c
View File

@ -602,7 +602,6 @@ static void select_timeline_marker_frame(int frame, unsigned char shift)
/* 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];