diff options
| author | Ariel Manzur <ariel@godotengine.org> | 2015-11-14 11:14:17 -0300 |
|---|---|---|
| committer | Ariel Manzur <ariel@godotengine.org> | 2015-11-14 11:14:17 -0300 |
| commit | 8adc4ef65b76ee0e8a5fdf6c773d47716fa8511f (patch) | |
| tree | 52352636c1807d7f3590703ed4eb01bf0062636a | |
| parent | 8420c24f7f35cdd7adbc7d4595cb1756020ab127 (diff) | |
windows crash and bind placeholder method
| -rw-r--r-- | platform/windows/os_windows.cpp | 6 | ||||
| -rw-r--r-- | scene/main/node.cpp | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 438a5a6903..55452052e4 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -1350,7 +1350,9 @@ void OS_Windows::finalize() { memdelete(main_loop); main_loop=NULL; - + + memdelete(input); + visual_server->finish(); memdelete(visual_server); #ifdef OPENGL_ENABLED @@ -1377,8 +1379,6 @@ void OS_Windows::finalize() { memdelete(audio_server); memdelete(sample_manager); - memdelete(input); - physics_server->finish(); memdelete(physics_server); 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); |