summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-06-08 08:16:38 +0200
committerGitHub <noreply@github.com>2021-06-08 08:16:38 +0200
commitabd234998897e203e8d7e20dbb57f835615773fc (patch)
tree52ea526aa823c11e8772048a82cc3e3312507773
parentd92e46233ca7236fd8d3ac49915e378b883298e4 (diff)
parent51ab10d3f467c0f0c6258da78b78bb5f43ad0d56 (diff)
Merge pull request #49378 from BastiaanOlij/fix_execute_modifications_bind
Fixed mistake in binding of Skeleton2D::execute_modifications
-rw-r--r--doc/classes/Skeleton2D.xml2
-rw-r--r--scene/2d/skeleton_2d.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/classes/Skeleton2D.xml b/doc/classes/Skeleton2D.xml
index 80db57d7d0..6665a4a9f6 100644
--- a/doc/classes/Skeleton2D.xml
+++ b/doc/classes/Skeleton2D.xml
@@ -13,7 +13,7 @@
<method name="execute_modifications">
<return type="void">
</return>
- <argument index="0" name="execution_mode" type="float">
+ <argument index="0" name="delta" type="float">
</argument>
<argument index="1" name="execution_mode" type="int">
</argument>
diff --git a/scene/2d/skeleton_2d.cpp b/scene/2d/skeleton_2d.cpp
index c5ad3dde39..8f1f5fadbc 100644
--- a/scene/2d/skeleton_2d.cpp
+++ b/scene/2d/skeleton_2d.cpp
@@ -787,7 +787,7 @@ void Skeleton2D::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_modification_stack", "modification_stack"), &Skeleton2D::set_modification_stack);
ClassDB::bind_method(D_METHOD("get_modification_stack"), &Skeleton2D::get_modification_stack);
- ClassDB::bind_method(D_METHOD("execute_modifications", "execution_mode", "execution_mode"), &Skeleton2D::execute_modifications);
+ ClassDB::bind_method(D_METHOD("execute_modifications", "delta", "execution_mode"), &Skeleton2D::execute_modifications);
ClassDB::bind_method(D_METHOD("set_bone_local_pose_override", "bone_idx", "override_pose", "strength", "persistent"), &Skeleton2D::set_bone_local_pose_override);
ClassDB::bind_method(D_METHOD("get_bone_local_pose_override", "bone_idx"), &Skeleton2D::get_bone_local_pose_override);