blender
/
blender
137
415
Fork 599
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

Animation: At the boundary frame between non-muted NLA strips, evaluate the first frame of the later strip instead of the last frame of the earlier. #113487

Open
Paolo Amadini wants to merge 1 commits from pamadini/blender:nla-adjacent-strips into main
pull from: pamadini/blender:nla-adjacent-strips
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 1 Files Changed 1 +9 -2
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/blenkernel/intern/anim_sys.cc
View File

@ -980,8 +980,15 @@ NlaEvalStrip *nlastrips_ctime_get_strip(ListBase *list,
}
if (in_range) {
/* this strip is active, so try to use it */
estrip = strip;
/* If we are at the last frame of the current strip and a non-muted strip starts immediately
* after, return the first frame of the next strip instead. */
if (strip->next && ctime == strip->next->start && !(strip->next->flag & NLASTRIP_FLAG_MUTED))
{
estrip = strip->next;
}
else {
estrip = strip;
}
side = NES_TIME_WITHIN;
break;
}