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

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);
+	}
 
 
 

modules/gdscript/gd_functions.cpp

@@ -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++) {
 
 				String os = p_args[i]->operator String();;
+
 				if (i==0)
 					str=os;
 				else