diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2023-04-06 14:35:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-06 14:35:04 +0200 |
commit | 92b7a9603aa2395be6bf361067096538ba393c45 (patch) | |
tree | dcd4ea07ad2e3b960444d56382e5ceec97b02ddd /scene/2d/skeleton_2d.cpp | |
parent | 49a196277f86977d08cc10b6bb878427ae54a964 (diff) | |
parent | 104392ef4ea7b983b27c44de72adfc627500e814 (diff) | |
download | redot-engine-92b7a9603aa2395be6bf361067096538ba393c45.tar.gz |
Merge pull request #75701 from reduz/notification-moved-in-parent
Remove NOTIFICATION_MOVED_IN_PARENT
Diffstat (limited to 'scene/2d/skeleton_2d.cpp')
-rw-r--r-- | scene/2d/skeleton_2d.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/scene/2d/skeleton_2d.cpp b/scene/2d/skeleton_2d.cpp index 4fdc7b3584..f2270d2b18 100644 --- a/scene/2d/skeleton_2d.cpp +++ b/scene/2d/skeleton_2d.cpp @@ -115,6 +115,7 @@ void Bone2D::_notification(int p_what) { bone.bone = this; skeleton->bones.push_back(bone); skeleton->_make_bone_setup_dirty(); + get_parent()->connect(SNAME("child_order_changed"), callable_mp(skeleton, &Skeleton2D::_make_bone_setup_dirty), CONNECT_REFERENCE_COUNTED); } cache_transform = get_transform(); @@ -154,15 +155,6 @@ void Bone2D::_notification(int p_what) { #endif // TOOLS_ENABLED } break; - case NOTIFICATION_MOVED_IN_PARENT: { - if (skeleton) { - skeleton->_make_bone_setup_dirty(); - } - if (copy_transform_to_cache) { - cache_transform = get_transform(); - } - } break; - case NOTIFICATION_EXIT_TREE: { if (skeleton) { for (int i = 0; i < skeleton->bones.size(); i++) { @@ -172,7 +164,7 @@ void Bone2D::_notification(int p_what) { } } skeleton->_make_bone_setup_dirty(); - skeleton = nullptr; + get_parent()->disconnect(SNAME("child_order_changed"), callable_mp(skeleton, &Skeleton2D::_make_bone_setup_dirty)); } parent_bone = nullptr; set_transform(cache_transform); |