diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-04-09 20:40:48 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-04-09 20:40:48 -0300 |
| commit | 1c480698ce0e881cbd28f1f0ddba95cee74ca834 (patch) | |
| tree | ec97e2a6152d036fd2dee490d62500dfa7da2339 | |
| parent | 7ba71fb24346fb87f50a9eb4aa6b675c31507528 (diff) | |
-Fixed crash with splash screen on windows
-properly show editor without having to resize window on windows
| -rw-r--r-- | drivers/gles3/rasterizer_storage_gles3.cpp | 1 | ||||
| -rw-r--r-- | scene/main/scene_main_loop.cpp | 2 | ||||
| -rw-r--r-- | servers/visual/visual_server_raster.cpp | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index 3ce4f7b96f..beed923a58 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -6500,6 +6500,7 @@ void RasterizerStorageGLES3::initialize() { frame.count = 0; frame.prev_tick = 0; frame.delta = 0; + frame.current_rt=NULL; config.keep_original_textures = false; } diff --git a/scene/main/scene_main_loop.cpp b/scene/main/scene_main_loop.cpp index 83f60bb9e9..be28479f39 100644 --- a/scene/main/scene_main_loop.cpp +++ b/scene/main/scene_main_loop.cpp @@ -2317,7 +2317,7 @@ SceneTree::SceneTree() { stretch_aspect = STRETCH_ASPECT_IGNORE; last_screen_size = Size2(OS::get_singleton()->get_video_mode().width, OS::get_singleton()->get_video_mode().height); - root->set_size(last_screen_size); + _update_root_rect(); if (ScriptDebugger::get_singleton()) { ScriptDebugger::get_singleton()->set_request_scene_tree_message_func(_debugger_request_tree, this); diff --git a/servers/visual/visual_server_raster.cpp b/servers/visual/visual_server_raster.cpp index 9c1595425c..5ba975d193 100644 --- a/servers/visual/visual_server_raster.cpp +++ b/servers/visual/visual_server_raster.cpp @@ -123,6 +123,7 @@ int VisualServerRaster::get_render_info(RenderInfo p_info) { void VisualServerRaster::set_boot_image(const Image &p_image, const Color &p_color, bool p_scale) { + redraw_request(); VSG::rasterizer->set_boot_image(p_image, p_color, p_scale); } void VisualServerRaster::set_default_clear_color(const Color &p_color) { |