diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-20 09:50:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-20 09:50:01 +0200 |
| commit | b4baec08cf4e623fe3caa03130fda8d366538c9e (patch) | |
| tree | f702d031601d6b40123e412f4c4217b751ec5cea /scene/animation/animation_player.cpp | |
| parent | 87d8927ab026f8c66e71ca04d57c497f8d5d8b89 (diff) | |
| parent | 2f9a0268ddbf07ea3cd1eed320a4270c99165de5 (diff) | |
| download | redot-engine-b4baec08cf4e623fe3caa03130fda8d366538c9e.tar.gz | |
Merge pull request #50206 from groud/undoredo_increase_args_count
Increase the number of arguments accepted by UndoRedo methods
Diffstat (limited to 'scene/animation/animation_player.cpp')
| -rw-r--r-- | scene/animation/animation_player.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index 5d731629ca..14ca325c25 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -557,6 +557,7 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float } #endif + static_assert(VARIANT_ARG_MAX == 8, "This code needs to be updated if VARIANT_ARG_MAX != 8"); if (can_call) { if (method_call_mode == ANIMATION_METHOD_CALL_DEFERRED) { MessageQueue::get_singleton()->push_call( @@ -566,7 +567,10 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float s >= 2 ? params[1] : Variant(), s >= 3 ? params[2] : Variant(), s >= 4 ? params[3] : Variant(), - s >= 5 ? params[4] : Variant()); + s >= 5 ? params[4] : Variant(), + s >= 6 ? params[5] : Variant(), + s >= 7 ? params[6] : Variant(), + s >= 8 ? params[7] : Variant()); } else { nc->node->call( method, @@ -574,7 +578,10 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float s >= 2 ? params[1] : Variant(), s >= 3 ? params[2] : Variant(), s >= 4 ? params[3] : Variant(), - s >= 5 ? params[4] : Variant()); + s >= 5 ? params[4] : Variant(), + s >= 6 ? params[5] : Variant(), + s >= 7 ? params[6] : Variant(), + s >= 8 ? params[7] : Variant()); } } } |