asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6730 from Faless/fix_export_crash_error

Browse source 
Throw an error when exporting a resource class
This commit is contained in:
Rémi Verschelde 2016-10-09 14:44:10 +02:00 committed by GitHub
commit 5f7f73c6ae
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/gdscript/gd_parser.cpp
View file

@ -3109,6 +3109,16 @@ void GDParser::_parse_class(ClassNode *p_class) {
}
member._export.type=cn->value.get_type();
member._export.usage|=PROPERTY_USAGE_SCRIPT_VARIABLE;
if (cn->value.get_type()==Variant::OBJECT) {
Object *obj = cn->value;
Resource *res = obj->cast_to<Resource>();
if(res==NULL) {
_set_error("Exported constant not a type or resource.");
return;
}
member._export.hint=PROPERTY_HINT_RESOURCE_TYPE;
member._export.hint_string=res->get_type();
}
}
}
#ifdef TOOLS_ENABLED