godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #3440 from TheHX/issue-2946 

Fixed small inconsistencies with the text format
This commit is contained in:
Rémi Verschelde 2016-01-25 10:58:50 +01:00
parent 31a4762fea 41ae83e415
commit 6ceb1c3a9f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/globals.cpp
View File

@ -1419,7 +1419,7 @@ Globals::Globals() {
set("application/name","" ); set("application/name","" );
set("application/main_scene",""); 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/disable_stdout",false);
set("application/use_shared_user_dir",true); set("application/use_shared_user_dir",true);

3
scene/resources/scene_format_text.cpp
View File

@ -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 { 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") if (p_resource->get_type()=="PackedScene")
p_extensions->push_back("tscn"); //text scene p_extensions->push_back("tscn"); //text scene
else
p_extensions->push_back("tres"); //text resource
} }