diff options
author | Juan Linietsky <red@kyoko> | 2015-06-16 16:39:20 -0300 |
---|---|---|
committer | Juan Linietsky <red@kyoko> | 2015-06-16 16:39:20 -0300 |
commit | 37af8b413674936518a2ebe180f9e7bfcd5795bb (patch) | |
tree | da6993ed2cd087d93392c2c5542a70a078716fd2 /scene/main/node.cpp | |
parent | 669f5c994b5fe9fb870eae5db86b231202361617 (diff) | |
parent | f2a29aadc620c2296e08ca20e926b54191c37540 (diff) |
Merge branch 'master' of https://github.com/okamstudio/godot
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 ab530866bb..2530e3a36f 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); |