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

force thread model to single-safe when running editor, fixes #2387

Browse source
This commit is contained in:
Juan Linietsky 2015-12-31 16:24:27 -03:00
parent 9c38ad0093
commit ec3d17b4e2
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
main/main.cpp
View file

@ -714,8 +714,12 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
} }
if (rtm>=0 && rtm<3) if (rtm>=0 && rtm<3) {
if (editor) {
rtm=OS::RENDER_THREAD_SAFE;
}
OS::get_singleton()->_render_thread_mode=OS::RenderThreadMode(rtm); OS::get_singleton()->_render_thread_mode=OS::RenderThreadMode(rtm);
}

1
modules/gdscript/gd_functions.cpp
View file

@ -525,6 +525,7 @@ void GDFunctions::call(Function p_func,const Variant **p_args,int p_arg_count,Va
for(int i=0;i<p_arg_count;i++) { for(int i=0;i<p_arg_count;i++) {
String os = p_args[i]->operator String();; String os = p_args[i]->operator String();;
if (i==0) if (i==0)
str=os; str=os;
else else