Explorar el Código

windows crash and bind placeholder method

Ariel Manzur hace 9 años
padre
commit
8adc4ef65b
Se han modificado 2 ficheros con 7 adiciones y 3 borrados
  1. 3 3
      platform/windows/os_windows.cpp
  2. 4 0
      scene/main/node.cpp

+ 3 - 3
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);
 

+ 4 - 0
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);