asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #9124 from Zylann/fix_compilation

Browse source 
Fixed compilation on Windows + removed debug print
This commit is contained in:
Rémi Verschelde 2017-06-12 07:11:00 +02:00 committed by GitHub
commit a677fb9c13
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
servers/visual/visual_server_wrap_mt.h
View file

@ -374,7 +374,7 @@ public:
//this passes directly to avoid stalling, but it's pretty dangerous, so dont call after freeing a viewport //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) { 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) FUNC2(viewport_set_debug_draw, RID, ViewportDebugDraw)
@ -554,7 +554,7 @@ public:
//this passes directly to avoid stalling //this passes directly to avoid stalling
virtual int get_render_info(RenderInfo p_info) { 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) FUNC3(set_boot_image, const Ref<Image> &, const Color &, bool)

2
servers/visual_server.cpp
View file

@ -338,8 +338,6 @@ Error VisualServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint32_
PoolVector<uint8_t>::Write iw; PoolVector<uint8_t>::Write iw;
if (r_index_array.size()) { if (r_index_array.size()) {
print_line("elements: " + itos(r_index_array.size()));
iw = r_index_array.write(); iw = r_index_array.write();
} }