diff options
| author | Juan Linietsky | 2015-05-11 15:49:41 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-05-11 15:49:41 -0300 |
| commit | 4b8745ad63409cf14b02735981ee35d2f794421c (patch) | |
| tree | 607dcfbb77430e8ed7eef25de6b7bec9c4032aec /core/globals.cpp | |
| parent | dda60296d81edaabfdb56f47a2c949b5dad283fb (diff) | |
| parent | b777bf5ff5c3891daa0f93987ca12d0d7d053c2b (diff) | |
| download | godot-4b8745ad63409cf14b02735981ee35d2f794421c.tar.gz godot-4b8745ad63409cf14b02735981ee35d2f794421c.tar.zst godot-4b8745ad63409cf14b02735981ee35d2f794421c.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'core/globals.cpp')
| -rw-r--r-- | core/globals.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/globals.cpp b/core/globals.cpp index b128914de..23d8c16ac 100644 --- a/core/globals.cpp +++ b/core/globals.cpp @@ -1381,7 +1381,7 @@ Globals::Globals() { set("application/name","" ); set("application/main_scene",""); - custom_prop_info["application/main_scene"]=PropertyInfo(Variant::STRING,"application/main_scene",PROPERTY_HINT_FILE,"xml,res,scn,xscn"); + custom_prop_info["application/main_scene"]=PropertyInfo(Variant::STRING,"application/main_scene",PROPERTY_HINT_FILE,"scn,res,xscn,xml"); set("application/disable_stdout",false); set("application/use_shared_user_dir",true); |