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

Fix wrong children range when duplicating node

Browse Source
This commit is contained in:
kobewi
2025-05-11 17:32:29 +02:00
parent 19bb18716e
commit 258062e312
2 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scene/main/node.cpp
View File

@@ -3000,18 +3000,18 @@ Node *Node::_duplicate(int p_flags, HashMap<const Node *, Node *> *r_duplimap) c
} }
for (int i = 0; i < get_child_count(false); i++) { for (int i = 0; i < get_child_count(false); i++) {
if (instantiated && get_child(i)->data.owner == this) { if (instantiated && get_child(i, false)->data.owner == this) {
continue; //part of instance continue; //part of instance
} }
Node *dup = get_child(i)->_duplicate(p_flags, r_duplimap); Node *dup = get_child(i, false)->_duplicate(p_flags, r_duplimap);
if (!dup) { if (!dup) {
memdelete(node); memdelete(node);
return nullptr; return nullptr;
} }
node->add_child(dup); node->add_child(dup);
if (i < node->get_child_count() - 1) { if (i < node->get_child_count(false) - 1) {
node->move_child(dup, i); node->move_child(dup, i);
} }
} }
@@ -3030,9 +3030,9 @@ Node *Node::_duplicate(int p_flags, HashMap<const Node *, Node *> *r_duplimap) c
} }
parent->add_child(dup); parent->add_child(dup);
int pos = E->get_index(); int pos = E->get_index(false);
if (pos < parent->get_child_count() - 1) { if (pos < parent->get_child_count(false) - 1) {
parent->move_child(dup, pos); parent->move_child(dup, pos);
} }
} }

31
tests/scene/test_node.h
View File

@@ -96,6 +96,13 @@ public:
void set_exported_nodes(const Array &p_nodes) { exported_nodes = p_nodes; } void set_exported_nodes(const Array &p_nodes) { exported_nodes = p_nodes; }
Array get_exported_nodes() const { return exported_nodes; } Array get_exported_nodes() const { return exported_nodes; }
TestNode() {
Node *internal = memnew(Node);
add_child(internal, false, INTERNAL_MODE_FRONT);
internal = memnew(Node);
add_child(internal, false, INTERNAL_MODE_BACK);
}
}; };
TEST_CASE("[SceneTree][Node] Testing node operations with a very simple scene tree") { TEST_CASE("[SceneTree][Node] Testing node operations with a very simple scene tree") {
@@ -498,6 +505,24 @@ TEST_CASE("[SceneTree][Node] Testing node operations with a more complex simple
memdelete(node2); memdelete(node2);
} }
TEST_CASE("[SceneTree][Node] Duplicating node with internal children") {
GDREGISTER_CLASS(TestNode);
TestNode *node = memnew(TestNode);
Node *child = memnew(Node);
child->set_name("Child");
node->add_child(child);
int child_count = node->get_child_count();
Node *dup = node->duplicate();
CHECK(dup->get_child_count() == child_count);
CHECK(dup->has_node(String("Child")));
memdelete(node);
memdelete(dup);
}
TEST_CASE("[SceneTree][Node]Exported node checks") { TEST_CASE("[SceneTree][Node]Exported node checks") {
TestNode *node = memnew(TestNode); TestNode *node = memnew(TestNode);
SceneTree::get_singleton()->get_root()->add_child(node); SceneTree::get_singleton()->get_root()->add_child(node);
@@ -523,7 +548,7 @@ TEST_CASE("[SceneTree][Node]Exported node checks") {
TestNode *dup = Object::cast_to<TestNode>(node->duplicate()); TestNode *dup = Object::cast_to<TestNode>(node->duplicate());
Node *new_exported = Object::cast_to<Node>(dup->get("exported_node")); Node *new_exported = Object::cast_to<Node>(dup->get("exported_node"));
CHECK(new_exported == dup->get_child(0)); CHECK(new_exported == dup->get_child(0, false));
memdelete(dup); memdelete(dup);
} }
@@ -578,10 +603,10 @@ TEST_CASE("[SceneTree][Node]Exported node checks") {
root->add_child(sub_child); root->add_child(sub_child);
sub_child->set_owner(root); sub_child->set_owner(root);
sub_child->set("exported_node", sub_child->get_child(1)); sub_child->set("exported_node", sub_child->get_child(1, false));
children = Array(); children = Array();
children.append(sub_child->get_child(1)); children.append(sub_child->get_child(1, false));
sub_child->set("exported_nodes", children); sub_child->set("exported_nodes", children);
Ref<PackedScene> ps2; Ref<PackedScene> ps2;