diff options
author | Raul Santos <raulsntos@gmail.com> | 2021-12-28 18:28:01 +0100 |
---|---|---|
committer | Raul Santos <raulsntos@gmail.com> | 2021-12-28 18:28:01 +0100 |
commit | 5254b28632a3ea212ae69c86cc737768f26b9e12 (patch) | |
tree | 381fb2d7080178097ae8b69c2a4b6b37227cc733 /modules/mono/csharp_script.cpp | |
parent | 28174d531b7128f0281fc2b88da2f4962fd3513e (diff) |
Fix getting properties state when reloading C#
When reloading C# classes and keep their properties values they are
retrieved and stored in a state list.
Retrieving the properties was only getting the fields of the C# class
and not inherited fields so those properties values were lost on reload.
Now we also try to find the field in the parent classes.
Diffstat (limited to 'modules/mono/csharp_script.cpp')
-rw-r--r-- | modules/mono/csharp_script.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index 0ceb45d425..aa24f59fdb 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -1762,7 +1762,16 @@ void CSharpInstance::get_properties_state_for_reloading(List<Pair<StringName, Va ManagedType managedType; - GDMonoField *field = script->script_class->get_field(state_pair.first); + GDMonoField *field = nullptr; + GDMonoClass *top = script->script_class; + while (top && top != script->native) { + field = top->get_field(state_pair.first); + if (field) { + break; + } + + top = top->get_parent_class(); + } if (!field) { continue; // Properties ignored. We get the property baking fields instead. } |