Merge pull request #38638 from pepegadeveloper123/mono_inherited_scene_bug

Fix inherited C# scene not inheriting parent's fields

Merge pull request #38638 from pepegadeveloper123/mono_inherited_scene_bug
dbd90b94 · Rémi Verschelde · GitHub · 54bb4cb6 · 4e00d852 · dbd90b94
Unverified Commit dbd90b94 authored May 11, 2020 by Rémi Verschelde Committed by GitHub May 11, 2020
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 94 additions and 68 deletions

csharp_script.cpp modules/mono/csharp_script.cpp +92 -67

csharp_script.h modules/mono/csharp_script.h +2 -1

No files found.
--- a/modules/mono/csharp_script.cpp
+++ b/modules/mono/csharp_script.cpp
--- 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> &params);

 	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