diff options
| author | James McLean | 2015-06-21 23:15:58 -0400 |
|---|---|---|
| committer | James McLean | 2015-06-21 23:15:58 -0400 |
| commit | 4e3ec18f7e0794900974f70de4e293838d48c9fe (patch) | |
| tree | 52048d583a1881a8056a6cd50aab2f6e833eb241 /scene/main/node.cpp | |
| parent | 86c87ee66ab8601f081c89e8d85c75003b50ff78 (diff) | |
| parent | 37af8b413674936518a2ebe180f9e7bfcd5795bb (diff) | |
| download | godot-4e3ec18f7e0794900974f70de4e293838d48c9fe.tar.gz godot-4e3ec18f7e0794900974f70de4e293838d48c9fe.tar.zst godot-4e3ec18f7e0794900974f70de4e293838d48c9fe.zip | |
Merge branch 'master' of github.com:okamstudio/godot into development
Diffstat (limited to 'scene/main/node.cpp')
| -rw-r--r-- | scene/main/node.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp index ab530866b..2530e3a36 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -641,6 +641,7 @@ void Node::_add_child_nocheck(Node* p_child,const StringName& p_name) { p_child->data.pos=data.children.size(); data.children.push_back( p_child ); p_child->data.parent=this; + p_child->notification(NOTIFICATION_PARENTED); if (data.tree) { p_child->_set_tree(data.tree); @@ -649,7 +650,6 @@ void Node::_add_child_nocheck(Node* p_child,const StringName& p_name) { /* Notify */ //recognize childs created in this node constructor p_child->data.parent_owned=data.in_constructor; - p_child->notification(NOTIFICATION_PARENTED); add_child_notify(p_child); |