Merge branch 'master' of https://github.com/okamstudio/godot

Conflicts:
	drivers/theora/video_stream_theora.cpp

1 files changed, 4 insertions, 0 deletions

diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 631dc8dcc7..97c36ff71b 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -2039,6 +2039,10 @@ void Node::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("duplicate:Node","use_instancing"),&Node::duplicate,DEFVAL(false));
 	ObjectTypeDB::bind_method(_MD("replace_by","node:Node","keep_data"),&Node::replace_by,DEFVAL(false));
 
+	ObjectTypeDB::bind_method(_MD("set_scene_instance_load_placeholder","load_placeholder"),&Node::set_scene_instance_load_placeholder);
+	ObjectTypeDB::bind_method(_MD("get_scene_instance_load_placeholder"),&Node::get_scene_instance_load_placeholder);
+
+
 	ObjectTypeDB::bind_method(_MD("get_viewport"),&Node::get_viewport);
 
 	ObjectTypeDB::bind_method(_MD("queue_free"),&Node::queue_delete);