blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 772 Projects 19 Wiki Activity

Fix #100718: NLA Hold Forward Inconsistency #107281

Closed
Wayde Moss wants to merge 2 commits from wbmoss_dev/blender:pr_fix_100718_NLA_Hold_Forward_Inconsistency into main
pull from: wbmoss_dev/blender:pr_fix_100718_NLA_Hold_Forward_Inconsistency
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 6 Commits 2 Files Changed 1 +6 -10
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f03415f699 - Show all commits

16
source/blender/blenkernel/intern/anim_sys.c
View File

@ -3259,16 +3259,12 @@ static void animsys_create_action_track_strip(const AnimData *adt,
r_action_strip->extendmode = adt->act_extendmode; r_action_strip->extendmode = adt->act_extendmode;
r_action_strip->influence = adt->act_influence; r_action_strip->influence = adt->act_influence;
/* NOTE: must set this, or else the default setting overrides, /* Must set NLASTRIP_FLAG_USR_INFLUENCE, or else the default setting overrides, and influence
* and this setting doesn't work. */ * doesn't work.
r_action_strip->flag |= NLASTRIP_FLAG_USR_INFLUENCE; *
* Must set NLASTRIP_FLAG_NO_TIME_MAP, so Action Track fcurve evaluation extends beyond its
/* Unless extendmode is Nothing (might be useful for flattening NLA evaluation), disable range. * keyframe bounds. */
* Extendmode Nothing and Hold will behave as normal. Hold Forward will behave just like Hold. r_action_strip->flag |= NLASTRIP_FLAG_USR_INFLUENCE | NLASTRIP_FLAG_NO_TIME_MAP;
*/
if (r_action_strip->extendmode != NLASTRIP_EXTEND_NOTHING) {
r_action_strip->flag |= NLASTRIP_FLAG_NO_TIME_MAP;
}
const bool tweaking = (adt->flag & ADT_NLA_EDIT_ON) != 0; const bool tweaking = (adt->flag & ADT_NLA_EDIT_ON) != 0;
const bool soloing = (adt->flag & ADT_NLA_SOLO_TRACK) != 0; const bool soloing = (adt->flag & ADT_NLA_SOLO_TRACK) != 0;