diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-01-25 10:58:50 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-01-25 10:58:50 +0100 |
| commit | 6ceb1c3a9f83234e0703fba1ecb42f09e705a02e (patch) | |
| tree | 55997b41d840e940f44f9dd0d7fd9abff208b0e4 | |
| parent | 31a4762feab58d1eb68d02c9591a80662d383361 (diff) | |
| parent | 41ae83e41562213a8cd53643f124a13731a098ad (diff) | |
Merge pull request #3440 from TheHX/issue-2946
Fixed small inconsistencies with the text format
| -rw-r--r-- | core/globals.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/scene_format_text.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/globals.cpp b/core/globals.cpp index 1e60854f28..5f52420735 100644 --- a/core/globals.cpp +++ b/core/globals.cpp @@ -1419,7 +1419,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,"scn,res,xscn,xml"); + custom_prop_info["application/main_scene"]=PropertyInfo(Variant::STRING,"application/main_scene",PROPERTY_HINT_FILE,"scn,res,xscn,xml,tscn"); set("application/disable_stdout",false); set("application/use_shared_user_dir",true); diff --git a/scene/resources/scene_format_text.cpp b/scene/resources/scene_format_text.cpp index a6cba389f4..f3dcf16e28 100644 --- a/scene/resources/scene_format_text.cpp +++ b/scene/resources/scene_format_text.cpp @@ -1380,9 +1380,10 @@ bool ResourceFormatSaverText::recognize(const RES& p_resource) const { } void ResourceFormatSaverText::get_recognized_extensions(const RES& p_resource,List<String> *p_extensions) const { - p_extensions->push_back("tres"); //text resource if (p_resource->get_type()=="PackedScene") p_extensions->push_back("tscn"); //text scene + else + p_extensions->push_back("tres"); //text resource } |