asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #46292 from hilfazer/nested_scene_instances_duplication

Browse source
This commit is contained in:
Rémi Verschelde 2021-04-29 13:31:27 +02:00 committed by GitHub
commit 880b830ca8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
editor/scene_tree_dock.cpp
View file

@ -671,7 +671,6 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
editor_data->get_undo_redo().add_do_method(editor_selection, "clear");
Node *dupsingle = NULL;
List<Node *> editable_children;
selection.sort_custom<Node::Comparator>();
@ -688,9 +687,6 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
Map<const Node *, Node *> duplimap;
Node *dup = node->duplicate_from_editor(duplimap);
if (EditorNode::get_singleton()->get_edited_scene()->is_editable_instance(node))
editable_children.push_back(dup);
ERR_CONTINUE(!dup);
if (selection.size() == 1)
@ -724,10 +720,6 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
if (dupsingle)
editor->push_item(dupsingle);
for (List<Node *>::Element *E = editable_children.back(); E; E = E->prev())
_toggle_editable_children(E->get());
} break;
case TOOL_REPARENT: {

12
scene/main/node.cpp
View file

@ -2004,6 +2004,7 @@ Node *Node::_duplicate(int p_flags, Map<const Node *, Node *> *r_duplimap) const
if (get_filename() != "") { //an instance
node->set_filename(get_filename());
node->data.editable_instance = data.editable_instance;
}
StringName script_property_name = CoreStringNames::get_singleton()->_script;
@ -2016,19 +2017,26 @@ Node *Node::_duplicate(int p_flags, Map<const Node *, Node *> *r_duplimap) const
// Since nodes in the instanced hierarchy won't be duplicated explicitly, we need to make an inventory
// of all the nodes in the tree of the instanced scene in order to transfer the values of the properties
Vector<const Node *> instance_roots;
instance_roots.push_back(this);
for (List<const Node *>::Element *N = node_tree.front(); N; N = N->next()) {
for (int i = 0; i < N->get()->get_child_count(); ++i) {
Node *descendant = N->get()->get_child(i);
// Skip nodes not really belonging to the instanced hierarchy; they'll be processed normally later
// but remember non-instanced nodes that are hidden below instanced ones
if (descendant->data.owner != this) {
if (descendant->get_parent() && descendant->get_parent() != this && descendant->get_parent()->data.owner == this && descendant->data.owner != descendant->get_parent())
if (instance_roots.find(descendant->get_owner()) == -1) {
if (descendant->get_parent() && descendant->get_parent() != this && descendant->data.owner != descendant->get_parent())
hidden_roots.push_back(descendant);
continue;
}
node_tree.push_back(descendant);
if (descendant->get_filename() != "" && instance_roots.find(descendant->get_owner()) != -1) {
instance_roots.push_back(descendant);
}
}
}
}