blender
/
blender
136
412
Fork 596
Code Issues 6.3k Pull Requests 775 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 +21 -12
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -989,8 +989,21 @@ NlaEvalStrip *nlastrips_ctime_get_strip(ListBase *list,
/* loop over strips, checking if they fall within the range */ /* loop over strips, checking if they fall within the range */
for (strip = strips->first; strip; strip = strip->next) { for (strip = strips->first; strip; strip = strip->next) {
/* Check if current time occurs within this strip. */ /* Check if current time occurs within this strip. */
if (IN_RANGE_INCL(ctime, strip->start, strip->end) ||
(strip->flag & NLASTRIP_FLAG_NO_TIME_MAP)) { /* This block leads to the Action Track and non-time-remapped tweak strip evaluation to respect
* the extrapolation modes. If in_range, these two tracks will always output NES_TIME_WITHIN so
* fcurve extrapolation isn't clamped to the keyframe bounds. */
bool in_range = IN_RANGE_INCL(ctime, strip->start, strip->end);
if (strip->flag & NLASTRIP_FLAG_NO_TIME_MAP) {
if (ELEM(strip->extendmode, NLASTRIP_EXTEND_HOLD)) {
Sybren A. Stüvel commented 2023-06-01 17:50:26 +02:00
Review
Copy Link

Can't this just be coded like this? I don't see the need for ELEM() here.

switch (strip->extendmode) {
  case NLASTRIP_EXTEND_HOLD: in_range = true; break;
  case NLASTRIP_EXTEND_HOLD_FORWARD: in_range = ctime >= strip->start; break;
}
Can't this just be coded like this? I don't see the need for `ELEM()` here. ```c switch (strip->extendmode) { case NLASTRIP_EXTEND_HOLD: in_range = true; break; case NLASTRIP_EXTEND_HOLD_FORWARD: in_range = ctime >= strip->start; break; } ```
in_range = true;
}
else if (ELEM(strip->extendmode, NLASTRIP_EXTEND_HOLD_FORWARD)) {
in_range = ctime >= strip->start;
}
}
if (in_range) {
/* this strip is active, so try to use it */ /* this strip is active, so try to use it */
estrip = strip; estrip = strip;
side = NES_TIME_WITHIN; side = NES_TIME_WITHIN;
@ -3246,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;