summaryrefslogtreecommitdiff
path: root/scene/main/node.cpp
diff options
context:
space:
mode:
authorMarianoGNU <marianognu.easyrpg@gmail.com>2015-10-17 23:38:33 -0300
committerMarianoGNU <marianognu.easyrpg@gmail.com>2015-10-17 23:38:33 -0300
commit4452e262539ad9d52a5980305584d897829986d1 (patch)
treecde7f3bdc36e727a21f55938a131083f84e043a6 /scene/main/node.cpp
parent68fb30aaea0acf3ff279831d2d77b2e7129e4b69 (diff)
parent97f483af0a3e040f73c2df957bd092af2f6c085b (diff)
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'scene/main/node.cpp')
-rw-r--r--scene/main/node.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index dd4587c19f..631dc8dcc7 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -1993,7 +1993,7 @@ void Node::_bind_methods() {
ObjectTypeDB::bind_method(_MD("has_node","path"),&Node::has_node);
ObjectTypeDB::bind_method(_MD("get_node:Node","path"),&Node::get_node);
ObjectTypeDB::bind_method(_MD("get_parent:Parent"),&Node::get_parent);
- ObjectTypeDB::bind_method(_MD("find_node:Node","mask","recursive","owned"),&Node::get_node,DEFVAL(true),DEFVAL(true));
+ ObjectTypeDB::bind_method(_MD("find_node:Node","mask","recursive","owned"),&Node::find_node,DEFVAL(true),DEFVAL(true));
ObjectTypeDB::bind_method(_MD("has_node_and_resource","path"),&Node::has_node_and_resource);
ObjectTypeDB::bind_method(_MD("get_node_and_resource","path"),&Node::_get_node_and_resource);