godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #87964 from aaronfranke/4.1-fix-gltf-crash-root-skel-imp 

[4.1] Fix crash when importing a GLTF file with a skeleton as the root
This commit is contained in:
Rémi Verschelde 2024-02-05 18:03:47 +01:00 committed by GitHub
parent b9008f3d51 72f00333dd
commit 77598f0708
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/gltf/gltf_document.cpp
View File

@ -5836,8 +5836,13 @@ void GLTFDocument::_generate_skeleton_bone_node(Ref<GLTFState> p_state, Node *p_
p_scene_parent = bone_attachment; p_scene_parent = bone_attachment;
} }
if (skeleton->get_parent() == nullptr) { if (skeleton->get_parent() == nullptr) {
if (p_scene_root) {
p_scene_parent->add_child(skeleton, true); p_scene_parent->add_child(skeleton, true);
skeleton->set_owner(p_scene_root); skeleton->set_owner(p_scene_root);
} else {
p_scene_parent = skeleton;
p_scene_root = skeleton;
}
} }
} }
@ -6442,7 +6447,7 @@ void GLTFDocument::_process_mesh_instances(Ref<GLTFState> p_state, Node *p_scene
mi->get_parent()->remove_child(mi); mi->get_parent()->remove_child(mi);
skeleton->add_child(mi, true); skeleton->add_child(mi, true);
mi->set_owner(skeleton->get_owner()); mi->set_owner(p_scene_root);
mi->set_skin(p_state->skins.write[skin_i]->godot_skin); mi->set_skin(p_state->skins.write[skin_i]->godot_skin);
mi->set_skeleton_path(mi->get_path_to(skeleton)); mi->set_skeleton_path(mi->get_path_to(skeleton));