diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-05-09 13:09:20 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-05-09 13:09:20 -0300 |
| commit | 1fd1b7a91b2f60a2841b9684e1e41728275cedaf (patch) | |
| tree | 17678512dde4890e941c78ba90ba23b184e2ae9a /core/globals.cpp | |
| parent | 1a7d370fcf7382a9e248925a7eef12d28e0bb9e3 (diff) | |
| parent | 158785636c809d5ebdb6995a088c7776ce45e65c (diff) | |
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 b128914de5..23d8c16ace 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); |