godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Merge pull request #10581 from hpvb/fix-gcc6+

Browse Source 
Make cast_to a static member of Object.
This commit is contained in:
Rémi Verschelde
2017-08-25 08:37:38 +02:00
committed by GitHub
parent b1c0e45b03 cacced7e50
commit 490aef9369
185 changed files with 1336 additions and 1490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gdscript/gd_parser.cpp
View File

@@ -3959,7 +3959,7 @@ void GDParser::_parse_class(ClassNode *p_class) {
member._export.usage |= PROPERTY_USAGE_SCRIPT_VARIABLE;
if (cn->value.get_type() == Variant::OBJECT) {
Object *obj = cn->value;
Resource *res = obj->cast_to<Resource>();
Resource *res = Object::cast_to<Resource>(obj);
if (res == NULL) {
_set_error("Exported constant not a type or resource.");
return;