1berry/godotengine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mono: Fix crash with exported field of custom Reference derived type

Browse Source
This commit is contained in:
Ignacio Etcheverry 2019-03-07 22:32:08 +01:00
parent 4c0b0a6bdd
commit c5f8b0960a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/mono/csharp_script.cpp
View File

@ -2210,8 +2210,11 @@ bool CSharpScript::_get_member_export(GDMonoClass *p_class, IMonoClassMember *p_
hint_string = name_only_hint_string; hint_string = name_only_hint_string;
} }
} else if (variant_type == Variant::OBJECT && CACHED_CLASS(GodotReference)->is_assignable_from(type.type_class)) { } else if (variant_type == Variant::OBJECT && CACHED_CLASS(GodotReference)->is_assignable_from(type.type_class)) {
GDMonoClass *field_native_class = GDMonoUtils::get_class_native_base(type.type_class);
CRASH_COND(field_native_class == NULL);
hint = PROPERTY_HINT_RESOURCE_TYPE; hint = PROPERTY_HINT_RESOURCE_TYPE;
hint_string = NATIVE_GDMONOCLASS_NAME(type.type_class); hint_string = NATIVE_GDMONOCLASS_NAME(field_native_class);
} else { } else {
hint = PropertyHint(CACHED_FIELD(ExportAttribute, hint)->get_int_value(attr)); hint = PropertyHint(CACHED_FIELD(ExportAttribute, hint)->get_int_value(attr));
hint_string = CACHED_FIELD(ExportAttribute, hintString)->get_string_value(attr); hint_string = CACHED_FIELD(ExportAttribute, hintString)->get_string_value(attr);