Relintai
/
godot
mirror of https://github.com/Relintai/godot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

windows crash and bind placeholder method

This commit is contained in:
Ariel Manzur 2015-11-14 11:14:17 -03:00
parent 8420c24f7f
commit 8adc4ef65b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
platform/windows/os_windows.cpp
View File

@ -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);

4
scene/main/node.cpp
View File

@ -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);