diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-11 10:19:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-11 10:19:15 +0200 |
| commit | dbd90b9478f4243bc0ed46527afcd6be78279266 (patch) | |
| tree | 5df3e3548a48c2726e75c6fc9a009db285779347 /modules/mono/csharp_script.h | |
| parent | 54bb4cb6d66237e9b173d879fca50eefa7cbf6fa (diff) | |
| parent | 4e00d8520db33de62645043af3d9d3ca83b1153f (diff) | |
Merge pull request #38638 from pepegadeveloper123/mono_inherited_scene_bug
Fix inherited C# scene not inheriting parent's fields
Diffstat (limited to 'modules/mono/csharp_script.h')
| -rw-r--r-- | modules/mono/csharp_script.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/mono/csharp_script.h b/modules/mono/csharp_script.h index 05e2857538..c9ea482c36 100644 --- a/modules/mono/csharp_script.h +++ b/modules/mono/csharp_script.h @@ -147,8 +147,9 @@ private: bool _get_signal(GDMonoClass *p_class, GDMonoMethod *p_delegate_invoke, Vector<SignalParameter> ¶ms); bool _update_exports(); -#ifdef TOOLS_ENABLED + bool _get_member_export(IMonoClassMember *p_member, bool p_inspect_export, PropertyInfo &r_prop_info, bool &r_exported); +#ifdef TOOLS_ENABLED static int _try_get_member_export_hint(IMonoClassMember *p_member, ManagedType p_type, Variant::Type p_variant_type, bool p_allow_generics, PropertyHint &r_hint, String &r_hint_string); #endif |