diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-12 15:29:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-12 15:29:25 +0100 |
| commit | c4835c434502e23148585324a16c2bdc1c943ca2 (patch) | |
| tree | 0758ca05db4016317c7ffb969f4129c2e111d2fe /modules/mono/csharp_script.h | |
| parent | 8fd6a02d3e18ee9001ba4e397bd65b789781891e (diff) | |
| parent | 9df44c2d2cbae10aa7b27b2562d00d69c2caecb8 (diff) | |
Merge pull request #25721 from neikeq/ww
Use script instance binding for objects constructed from C#
Diffstat (limited to 'modules/mono/csharp_script.h')
| -rw-r--r-- | modules/mono/csharp_script.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/mono/csharp_script.h b/modules/mono/csharp_script.h index db9d6a73a2..8b1a4b5f7e 100644 --- a/modules/mono/csharp_script.h +++ b/modules/mono/csharp_script.h @@ -135,7 +135,7 @@ class CSharpScript : public Script { // Do not use unless you know what you are doing friend void GDMonoInternals::tie_managed_to_unmanaged(MonoObject *, Object *); - static Ref<CSharpScript> create_for_managed_type(GDMonoClass *p_class); + static Ref<CSharpScript> create_for_managed_type(GDMonoClass *p_class, GDMonoClass *p_native); protected: static void _bind_methods(); @@ -312,6 +312,8 @@ class CSharpLanguage : public ScriptLanguage { public: StringNameCache string_names; + Mutex *get_language_bind_mutex() { return language_bind_mutex; } + _FORCE_INLINE_ int get_language_index() { return lang_idx; } void set_language_index(int p_idx); @@ -406,6 +408,7 @@ public: virtual void refcount_incremented_instance_binding(Object *p_object); virtual bool refcount_decremented_instance_binding(Object *p_object); + Map<Object *, CSharpScriptBinding>::Element *insert_script_binding(Object *p_object, const CSharpScriptBinding &p_script_binding); bool setup_csharp_script_binding(CSharpScriptBinding &r_script_binding, Object *p_object); #ifdef DEBUG_ENABLED |