godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-06 17:25:19 +00:00
Code Releases Wiki Activity

Merge pull request #95121 from aaronfranke/gltf-root-prop-owner

Browse Source 
GLTF: Propagate owner for root node children
This commit is contained in:
Rémi Verschelde
2024-08-19 14:34:04 +02:00
parent 3241b440ef 246cc7e86d
commit 3e1b61d808
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/gltf/gltf_document.cpp
View File

@@ -5658,6 +5658,15 @@ void GLTFDocument::_generate_scene_node(Ref<GLTFState> p_state, const GLTFNodeIn
if (p_scene_root == nullptr) { if (p_scene_root == nullptr) {
// If the root node argument is null, this is the root node. // If the root node argument is null, this is the root node.
p_scene_root = current_node; p_scene_root = current_node;
// If multiple nodes were generated under the root node, ensure they have the owner set.
if (unlikely(current_node->get_child_count() > 0)) {
Array args;
args.append(p_scene_root);
for (int i = 0; i < current_node->get_child_count(); i++) {
Node *child = current_node->get_child(i);
child->propagate_call(StringName("set_owner"), args);
}
}
} else { } else {
// Add the node we generated and set the owner to the scene root. // Add the node we generated and set the owner to the scene root.
p_scene_parent->add_child(current_node, true); p_scene_parent->add_child(current_node, true);