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

Fix crash when importing a GLTF file with a skeleton as the root 

(cherry picked from commit 4c8d69f264)
This commit is contained in:
Aaron Franke 2024-02-04 02:47:44 -06:00 committed by Rémi Verschelde
parent 696e9e04d9
commit 7513a79555
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/gltf/gltf_document.cpp
View File

@ -5989,8 +5989,13 @@ void GLTFDocument::_generate_skeleton_bone_node(Ref<GLTFState> p_state, const GL
p_scene_parent = bone_attachment; p_scene_parent = bone_attachment;
} }
if (skeleton->get_parent() == nullptr) { if (skeleton->get_parent() == nullptr) {
p_scene_parent->add_child(skeleton, true); if (p_scene_root) {
skeleton->set_owner(p_scene_root); p_scene_parent->add_child(skeleton, true);
skeleton->set_owner(p_scene_root);
} else {
p_scene_parent = skeleton;
p_scene_root = skeleton;
}
} }
} }
@ -6580,7 +6585,7 @@ float GLTFDocument::get_max_component(const Color &p_color) {
return MAX(MAX(r, g), b); return MAX(MAX(r, g), b);
} }
void GLTFDocument::_process_mesh_instances(Ref<GLTFState> p_state) { void GLTFDocument::_process_mesh_instances(Ref<GLTFState> p_state, Node *p_scene_root) {
for (GLTFNodeIndex node_i = 0; node_i < p_state->nodes.size(); ++node_i) { for (GLTFNodeIndex node_i = 0; node_i < p_state->nodes.size(); ++node_i) {
Ref<GLTFNode> node = p_state->nodes[node_i]; Ref<GLTFNode> node = p_state->nodes[node_i];
@ -6605,7 +6610,7 @@ void GLTFDocument::_process_mesh_instances(Ref<GLTFState> p_state) {
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));
@ -7455,7 +7460,7 @@ Node *GLTFDocument::generate_scene(Ref<GLTFState> p_state, float p_bake_fps, boo
Error err = OK; Error err = OK;
Node *root = _generate_scene_node_tree(p_state); Node *root = _generate_scene_node_tree(p_state);
ERR_FAIL_NULL_V(root, nullptr); ERR_FAIL_NULL_V(root, nullptr);
_process_mesh_instances(p_state); _process_mesh_instances(p_state, root);
if (p_state->get_create_animations() && p_state->animations.size()) { if (p_state->get_create_animations() && p_state->animations.size()) {
AnimationPlayer *ap = memnew(AnimationPlayer); AnimationPlayer *ap = memnew(AnimationPlayer);
root->add_child(ap, true); root->add_child(ap, true);

2
modules/gltf/gltf_document.h
View File

@ -325,7 +325,7 @@ public:
Error _parse_gltf_state(Ref<GLTFState> p_state, const String &p_search_path); Error _parse_gltf_state(Ref<GLTFState> p_state, const String &p_search_path);
Error _parse_asset_header(Ref<GLTFState> p_state); Error _parse_asset_header(Ref<GLTFState> p_state);
Error _parse_gltf_extensions(Ref<GLTFState> p_state); Error _parse_gltf_extensions(Ref<GLTFState> p_state);
void _process_mesh_instances(Ref<GLTFState> p_state); void _process_mesh_instances(Ref<GLTFState> p_state, Node *p_scene_root);
Node *_generate_scene_node_tree(Ref<GLTFState> p_state); Node *_generate_scene_node_tree(Ref<GLTFState> p_state);
void _generate_scene_node(Ref<GLTFState> p_state, const GLTFNodeIndex p_node_index, Node *p_scene_parent, Node *p_scene_root); void _generate_scene_node(Ref<GLTFState> p_state, const GLTFNodeIndex p_node_index, Node *p_scene_parent, Node *p_scene_root);
void _generate_skeleton_bone_node(Ref<GLTFState> p_state, const GLTFNodeIndex p_node_index, Node *p_scene_parent, Node *p_scene_root); void _generate_skeleton_bone_node(Ref<GLTFState> p_state, const GLTFNodeIndex p_node_index, Node *p_scene_parent, Node *p_scene_root);