summaryrefslogtreecommitdiff
path: root/main/main.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-12-31 16:24:27 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-12-31 16:24:27 -0300
commitec3d17b4e2b3d87ec6b46c57280ec853b264b20b (patch)
treeafa0c7e2c749926e0910e7074150da7bdeae25cf /main/main.cpp
parent9c38ad00936f89c4c6ddacfdbf0332e9f1623bca (diff)
force thread model to single-safe when running editor, fixes #2387
Diffstat (limited to 'main/main.cpp')
-rw-r--r--main/main.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 4dca79fd55..2702c847a5 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -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);
+ }