diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-09-12 10:56:13 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-09-12 10:56:13 -0300 |
| commit | 89a901c4b6a2fe24e781e497ec1a8e8fd69dd59c (patch) | |
| tree | 536ecaff5136b65706ae162369f92235c7c32ed6 /servers | |
| parent | a88f67821ca828d9b4d3453b19de60e27ab24efc (diff) | |
| parent | 943714c0153a74e6512097024cbca4453b50526a (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/visual/rasterizer.h | 1 | ||||
| -rw-r--r-- | servers/visual/visual_server_raster.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/servers/visual/rasterizer.h b/servers/visual/rasterizer.h index 0b115a4d1d..15c757665b 100644 --- a/servers/visual/rasterizer.h +++ b/servers/visual/rasterizer.h @@ -1022,6 +1022,7 @@ public: virtual bool has_feature(VS::Features p_feature) const=0; + virtual void restore_framebuffer()=0; virtual int get_render_info(VS::RenderInfo p_info)=0; diff --git a/servers/visual/visual_server_raster.cpp b/servers/visual/visual_server_raster.cpp index 8b47596d7e..155d10d85a 100644 --- a/servers/visual/visual_server_raster.cpp +++ b/servers/visual/visual_server_raster.cpp @@ -7427,6 +7427,8 @@ void VisualServerRaster::set_boot_image(const Image& p_image, const Color& p_col if (p_image.empty()) return; + rasterizer->restore_framebuffer(); + rasterizer->begin_frame(); int window_w = OS::get_singleton()->get_video_mode(0).width; |