diff options
author | Alexander Gavrilov <angavrilov@gmail.com> | 2019-05-16 09:47:57 +0300 |
---|---|---|
committer | Alexander Gavrilov <angavrilov@gmail.com> | 2019-05-16 09:48:46 +0300 |
commit | 65199828766afff21b1a1741fd5a7d651d92f17d (patch) | |
tree | aa3a5f22e83b421044706162ce35d6fc4d92836b /source/blender/blenkernel/intern/anim_sys.c | |
parent | e097845a6fab925a364b029c7b709db2b46176e1 (diff) |
Fix T64681: evaluate curves with generative modifiers and no keys.
Introduce a new function and use it everywhere, including
automatic curve deletion checks to guarantee consistency.
Diffstat (limited to 'source/blender/blenkernel/intern/anim_sys.c')
-rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 663eb4027f6..ab7e59a059b 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -1894,7 +1894,7 @@ static void animsys_evaluate_fcurves(Depsgraph *depsgraph, continue; } /* Skip empty curves, as if muted. */ - if (fcu->totvert == 0) { + if (BKE_fcurve_is_empty(fcu)) { continue; } PathResolvedRNA anim_rna; @@ -2009,7 +2009,7 @@ void animsys_evaluate_action_group(PointerRNA *ptr, bAction *act, bActionGroup * /* calculate then execute each curve */ for (fcu = agrp->channels.first; (fcu) && (fcu->grp == agrp); fcu = fcu->next) { /* check if this curve should be skipped */ - if ((fcu->flag & (FCURVE_MUTED | FCURVE_DISABLED)) == 0 && fcu->totvert != 0) { + if ((fcu->flag & (FCURVE_MUTED | FCURVE_DISABLED)) == 0 && !BKE_fcurve_is_empty(fcu)) { PathResolvedRNA anim_rna; if (animsys_store_rna_setting(ptr, fcu->rna_path, fcu->array_index, &anim_rna)) { const float curval = calculate_fcurve(&anim_rna, fcu, ctime); @@ -3105,7 +3105,7 @@ static void nlastrip_evaluate_actionclip(PointerRNA *ptr, if ((fcu->grp) && (fcu->grp->flag & AGRP_MUTED)) { continue; } - if (fcu->totvert == 0) { + if (BKE_fcurve_is_empty(fcu)) { continue; } @@ -3334,7 +3334,7 @@ static void nla_eval_domain_action(PointerRNA *ptr, if ((fcu->grp) && (fcu->grp->flag & AGRP_MUTED)) { continue; } - if (fcu->totvert == 0) { + if (BKE_fcurve_is_empty(fcu)) { continue; } |