diff options
author | Ariel Manzur <ariel@godotengine.org> | 2015-12-17 06:26:33 -0300 |
---|---|---|
committer | Ariel Manzur <ariel@godotengine.org> | 2015-12-17 06:26:33 -0300 |
commit | 19267f30d91fe3554435cae66cc80eddeb93b119 (patch) | |
tree | c005158c3476b645073d11a961a2994c2a4dd21b /scene/animation/animation_tree_player.cpp | |
parent | 10298b9534937c8662fe6bea6dcf79457bd53970 (diff) | |
parent | 93a6ec1e32df7f8f6156f728fe3f82a69ee126ca (diff) | |
download | redot-engine-19267f30d91fe3554435cae66cc80eddeb93b119.tar.gz |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'scene/animation/animation_tree_player.cpp')
-rw-r--r-- | scene/animation/animation_tree_player.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp index c04c653819..eeb2e6aa32 100644 --- a/scene/animation/animation_tree_player.cpp +++ b/scene/animation/animation_tree_player.cpp @@ -837,7 +837,7 @@ void AnimationTreePlayer::_process_animation(float p_delta) { StringName method = a->method_track_get_name(tr.local_track,E->get()); Vector<Variant> args=a->method_track_get_params(tr.local_track,E->get()); - ERR_CONTINUE(args.size()!=VARIANT_ARG_MAX); + args.resize(VARIANT_ARG_MAX); tr.track->node->call(method,args[0],args[1],args[2],args[3],args[4]); } } break; |