Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Fix initialization of visual server in all platforms

Browse source 
Avoid leaking an extra instance when using threads. Also fix threaded
loading issues on Android and iOS.
This commit is contained in:
George Marques 2018-11-01 10:27:04 -03:00
parent aec8ea4f47
commit 4c9d734a75
7 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
platform/android/os_android.cpp
View file

@ -39,7 +39,7 @@
#include "file_access_android.h"
#include "main/main.h"
#include "servers/visual/visual_server_raster.h"
//#include "servers/visual/visual_server_wrap_mt.h"
#include "servers/visual/visual_server_wrap_mt.h"
#ifdef ANDROID_NATIVE_ACTIVITY
#include "dir_access_android.h"
@ -182,11 +182,12 @@ Error OS_Android::initialize(const VideoMode &p_desired, int p_video_driver, int
video_driver_index = p_video_driver;
visual_server = memnew(VisualServerRaster);
/* if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) {
if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) {
visual_server = memnew(VisualServerWrapMT(visual_server, false));
};*/
} else {
visual_server = memnew(VisualServerRaster);
}
visual_server->init();
// visual_server->cursor_set_visible(false, 0);