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

Fix CSharpInstance::set not working with base classes

This commit is contained in:
Ignacio Etcheverry 2019-03-08 00:12:19 +01:00
parent 201cb8d7ed
commit a4825c2f8b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/mono/csharp_script.cpp
View File

@ -1315,14 +1315,14 @@ bool CSharpInstance::set(const StringName &p_name, const Variant &p_value) {
GDMonoClass *top = script->script_class; GDMonoClass *top = script->script_class;
while (top && top != script->native) { while (top && top != script->native) {
GDMonoField *field = script->script_class->get_field(p_name); GDMonoField *field = top->get_field(p_name);
if (field) { if (field) {
field->set_value_from_variant(mono_object, p_value); field->set_value_from_variant(mono_object, p_value);
return true; return true;
} }
GDMonoProperty *property = script->script_class->get_property(p_name); GDMonoProperty *property = top->get_property(p_name);
if (property) { if (property) {
property->set_value(mono_object, GDMonoMarshal::variant_to_mono_object(p_value, property->get_type())); property->set_value(mono_object, GDMonoMarshal::variant_to_mono_object(p_value, property->get_type()));