From fdbc54ca742e3a2b428be2ce4885ef85f61be9dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Mon, 1 Mar 2021 17:37:26 +0100 Subject: [PATCH] Cleanup: remove superfluous `animsys_evaluate_action_ex()` call Remove `animsys_evaluate_action()` and rename `animsys_evaluate_action_ex()` to it. The only function of the former was to call the latter, with the exact same parameters. No functional changes. --- source/blender/blenkernel/intern/anim_sys.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 4d490f8f76a..ca63d1cb692 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -756,10 +756,10 @@ void animsys_evaluate_action_group(PointerRNA *ptr, } /* Evaluate Action (F-Curve Bag) */ -static void animsys_evaluate_action_ex(PointerRNA *ptr, - bAction *act, - const AnimationEvalContext *anim_eval_context, - const bool flush_to_original) +void animsys_evaluate_action(PointerRNA *ptr, + bAction *act, + const AnimationEvalContext *anim_eval_context, + const bool flush_to_original) { /* check if mapper is appropriate for use here (we set to NULL if it's inappropriate) */ if (act == NULL) { @@ -772,14 +772,6 @@ static void animsys_evaluate_action_ex(PointerRNA *ptr, animsys_evaluate_fcurves(ptr, &act->curves, anim_eval_context, flush_to_original); } -void animsys_evaluate_action(PointerRNA *ptr, - bAction *act, - const AnimationEvalContext *anim_eval_context, - const bool flush_to_original) -{ - animsys_evaluate_action_ex(ptr, act, anim_eval_context, flush_to_original); -} - /* ***************************************** */ /* NLA System - Evaluation */ @@ -2850,7 +2842,7 @@ void BKE_animsys_evaluate_animdata(ID *id, } /* evaluate Active Action only */ else if (adt->action) { - animsys_evaluate_action_ex(&id_ptr, adt->action, anim_eval_context, flush_to_original); + animsys_evaluate_action(&id_ptr, adt->action, anim_eval_context, flush_to_original); } }