diff options
| author | Spartan322 <Megacake1234@gmail.com> | 2024-10-18 17:26:56 -0400 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2024-10-18 17:26:56 -0400 |
| commit | ebbe3e8c51fcf89f6b19a74497cedb5a8c448979 (patch) | |
| tree | 075435b3a1b3ac57a75f1ca90865f61697c053f4 /scene/3d | |
| parent | edb8e2b1b2b09236bdcd76cb6c8b40b6fbb2abaf (diff) | |
| parent | 80f0b33313dae52d072ba2771a88ebcc4f0b4d6d (diff) | |
| download | redot-engine-ebbe3e8c51fcf89f6b19a74497cedb5a8c448979.tar.gz | |
Merge commit godotengine/godot@80f0b33313dae52d072ba2771a88ebcc4f0b4d6d
Diffstat (limited to 'scene/3d')
| -rw-r--r-- | scene/3d/mesh_instance_3d.cpp | 4 | ||||
| -rw-r--r-- | scene/3d/skeleton_3d.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scene/3d/mesh_instance_3d.cpp b/scene/3d/mesh_instance_3d.cpp index e0ec43493d..e5a60050b8 100644 --- a/scene/3d/mesh_instance_3d.cpp +++ b/scene/3d/mesh_instance_3d.cpp @@ -334,8 +334,8 @@ void MeshInstance3D::create_multiple_convex_collisions(const Ref<MeshConvexDecom void MeshInstance3D::_notification(int p_what) { switch (p_what) { - case NOTIFICATION_READY: { - callable_mp(this, &MeshInstance3D::_resolve_skeleton_path).call_deferred(); + case NOTIFICATION_ENTER_TREE: { + _resolve_skeleton_path(); } break; case NOTIFICATION_TRANSLATION_CHANGED: { if (mesh.is_valid()) { diff --git a/scene/3d/skeleton_3d.cpp b/scene/3d/skeleton_3d.cpp index 427c0c3925..56a11e44e5 100644 --- a/scene/3d/skeleton_3d.cpp +++ b/scene/3d/skeleton_3d.cpp @@ -328,6 +328,8 @@ void Skeleton3D::_notification(int p_what) { #ifndef DISABLE_DEPRECATED setup_simulator(); #endif // _DISABLE_DEPRECATED + update_flags = UPDATE_FLAG_POSE; + _notification(NOTIFICATION_UPDATE_SKELETON); } break; case NOTIFICATION_UPDATE_SKELETON: { // Update bone transforms to apply unprocessed poses. |