diff options
author | Marc Gilleron <marc.gilleron@gmail.com> | 2017-06-12 01:58:57 +0200 |
---|---|---|
committer | Marc Gilleron <marc.gilleron@gmail.com> | 2017-06-12 01:58:57 +0200 |
commit | af9fd6f44ad71c16aa5e0f3aa5157f92fa5a84fc (patch) | |
tree | 109db031e5d05b7c624cd20b4df1ff1b97028a23 | |
parent | 12b2652ecbe4acfe1a0391b162629cb2a86c1a0b (diff) |
Fixed compilation on Windows + removed debug print
-rw-r--r-- | servers/visual/visual_server_wrap_mt.h | 4 | ||||
-rw-r--r-- | servers/visual_server.cpp | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/servers/visual/visual_server_wrap_mt.h b/servers/visual/visual_server_wrap_mt.h index 407a4fd32b..6d65999df1 100644 --- a/servers/visual/visual_server_wrap_mt.h +++ b/servers/visual/visual_server_wrap_mt.h @@ -374,7 +374,7 @@ public: //this passes directly to avoid stalling, but it's pretty dangerous, so dont call after freeing a viewport virtual int viewport_get_render_info(RID p_viewport, ViewportRenderInfo p_info) { - visual_server->viewport_get_render_info(p_viewport, p_info); + return visual_server->viewport_get_render_info(p_viewport, p_info); } FUNC2(viewport_set_debug_draw, RID, ViewportDebugDraw) @@ -554,7 +554,7 @@ public: //this passes directly to avoid stalling virtual int get_render_info(RenderInfo p_info) { - visual_server->get_render_info(p_info); + return visual_server->get_render_info(p_info); } FUNC3(set_boot_image, const Ref<Image> &, const Color &, bool) diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp index 2f53465d11..b2dda455e9 100644 --- a/servers/visual_server.cpp +++ b/servers/visual_server.cpp @@ -338,8 +338,6 @@ Error VisualServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint32_ PoolVector<uint8_t>::Write iw; if (r_index_array.size()) { - print_line("elements: " + itos(r_index_array.size())); - iw = r_index_array.write(); } |