godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

update EditorDirDialog on external change, closes #4629

Browse Source
This commit is contained in:
Juan Linietsky
2016-06-18 16:03:00 -03:00
parent 81a10795dc
commit 5e7f1fc79b
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/main.cpp
View File

@@ -110,6 +110,7 @@ static bool use_debug_profiler=false;
static bool force_lowdpi=false;
static int init_screen=-1;
static bool use_vsync=true;
static bool editor=false;
static String unescape_cmdline(const String& p_str) {
@@ -281,7 +282,7 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
packed_data->add_pack_source(zip_packed_data);
#endif
bool editor=false;
while(I) {
@@ -953,7 +954,7 @@ Error Main::setup2() {
Globals::get_singleton()->set_custom_property_info("application/icon",PropertyInfo(Variant::STRING,"application/icon",PROPERTY_HINT_FILE,"*.png,*.webp"));
if (bool(GLOBAL_DEF("display/emulate_touchscreen",false))) {
if (!OS::get_singleton()->has_touchscreen_ui_hint() && Input::get_singleton()) {
if (!OS::get_singleton()->has_touchscreen_ui_hint() && Input::get_singleton() && !editor) {
//only if no touchscreen ui hint, set emulation
InputDefault *id = Input::get_singleton()->cast_to<InputDefault>();
if (id)