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

Fix signal duplication bug when duplicating node with instanced children 

Change error checking in `duplicate_signals()` to check for path to
`p_original`, thus adhering to the method used in `duplicate`, instead
of checking for ownership.
This commit is contained in:
Maganty Rushyendra 2020-06-08 17:19:50 +08:00
parent 1df2e81d3e
commit 0df5d74e6e
1 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
scene/main/node.cpp
View File

@ -2247,17 +2247,24 @@ void Node::_duplicate_and_reown(Node *p_new_parent, const Map<Node *, Node *> &p
// if the emitter node comes later in tree order than the receiver // if the emitter node comes later in tree order than the receiver
void Node::_duplicate_signals(const Node *p_original, Node *p_copy) const { void Node::_duplicate_signals(const Node *p_original, Node *p_copy) const {
if (this != p_original && (get_owner() != p_original && get_owner() != p_original->get_owner())) if ((this != p_original) && !(p_original->is_a_parent_of(this))) {
return; return;
}
List<const Node *> process_list;
process_list.push_back(this);
while (!process_list.empty()) {
const Node *n = process_list.front()->get();
process_list.pop_front();
List<Connection> conns; List<Connection> conns;
get_all_signal_connections(&conns); n->get_all_signal_connections(&conns);
for (List<Connection>::Element *E = conns.front(); E; E = E->next()) { for (List<Connection>::Element *E = conns.front(); E; E = E->next()) {
if (E->get().flags & CONNECT_PERSIST) { if (E->get().flags & CONNECT_PERSIST) {
//user connected //user connected
NodePath p = p_original->get_path_to(this); NodePath p = p_original->get_path_to(n);
Node *copy = p_copy->get_node(p); Node *copy = p_copy->get_node(p);
Node *target = Object::cast_to<Node>(E->get().target); Node *target = Object::cast_to<Node>(E->get().target);
@ -2268,12 +2275,13 @@ void Node::_duplicate_signals(const Node *p_original, Node *p_copy) const {
Node *copytarget = target; Node *copytarget = target;
// Atempt to find a path to the duplicate target, if it seems it's not part // Attempt 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 // 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 (p_copy->has_node(ptarget)) if (p_copy->has_node(ptarget)) {
copytarget = p_copy->get_node(ptarget); copytarget = p_copy->get_node(ptarget);
}
if (copy && copytarget && !copy->is_connected(E->get().signal, copytarget, E->get().method)) { if (copy && copytarget && !copy->is_connected(E->get().signal, copytarget, E->get().method)) {
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);
@ -2281,8 +2289,9 @@ void Node::_duplicate_signals(const Node *p_original, Node *p_copy) const {
} }
} }
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < n->get_child_count(); i++) {
get_child(i)->_duplicate_signals(p_original, p_copy); process_list.push_back(n->get_child(i));
}
} }
} }