diff options
| author | Wayde Moss <wbmoss_dev@yahoo.com> | 2021-02-04 01:35:21 +0300 |
|---|---|---|
| committer | Wayde Moss <wbmoss_dev@yahoo.com> | 2021-02-04 01:35:21 +0300 |
| commit | 0352546cdd3814770053f80771c3abf20a4bd60b (patch) | |
| tree | ab2677ccd2a9a1c037e740f303deec442cf370c6 /source/blender/blenkernel/intern/anim_sys.c | |
| parent | 40b7929cc04005d25df69418adeb0a9e844d350a (diff) | |
NLA: Fix nlasnapshot_blend() Misplaced Null Check
From original commit: rB40b7929cc040
Diffstat (limited to 'source/blender/blenkernel/intern/anim_sys.c')
| -rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 646996bcaa8..923a77618aa 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -2532,6 +2532,11 @@ void nlasnapshot_blend(NlaEvalData *eval_data, continue; } + /** Blend with lower_snapshot's base or default. */ + if (lower_necs == NULL) { + lower_necs = nlaeval_snapshot_find_channel(lower_snapshot->base, nec); + } + NlaEvalChannelSnapshot *result_necs = nlaeval_snapshot_ensure_channel(r_blended_snapshot, nec); if (upper_necs == NULL || zero_upper_influence) { @@ -2539,11 +2544,6 @@ void nlasnapshot_blend(NlaEvalData *eval_data, continue; } - /** Blend with lower_snapshot's base or default. */ - if (lower_necs == NULL) { - lower_necs = nlaeval_snapshot_find_channel(lower_snapshot->base, nec); - } - if (upper_blendmode == NLASTRIP_MODE_COMBINE) { const int mix_mode = nec->mix_mode; if (mix_mode == NEC_MIX_QUATERNION) { |