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

Merge pull request #22675 from DualMatrix/duplicate_err 

Fixed error when duplicating node with signal from editor.
This commit is contained in:
Rémi Verschelde 2018-10-03 18:07:13 +02:00 committed by GitHub
parent 874e3b4a37 cb9559350f
commit f7cb23f9e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scene/main/node.cpp
View File

@ -2182,13 +2182,15 @@ void Node::_duplicate_signals(const Node *p_original, Node *p_copy) const {
continue; continue;
} }
NodePath ptarget = p_original->get_path_to(target); NodePath ptarget = p_original->get_path_to(target);
Node *copytarget = p_copy->get_node(ptarget);
// Cannot find a path to the duplicate target, so it seems it's not part Node *copytarget = target;
// of the duplicated and not yet parented hierarchy, so at least try to connect
// Atempt to find a path to the duplicate target, if it seems it's not part
// of the duplicated and not yet parented hierarchy then at least try to connect
// to the same target as the original // to the same target as the original
if (!copytarget)
copytarget = target; if (p_copy->has_node(ptarget))
copytarget = p_copy->get_node(ptarget);
if (copy && copytarget) { if (copy && copytarget) {
copy->connect(E->get().signal, copytarget, E->get().method, E->get().binds, E->get().flags); copy->connect(E->get().signal, copytarget, E->get().method, E->get().binds, E->get().flags);