diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-20 15:09:27 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-10-20 15:09:27 +0200 |
| commit | 01a80647607df9e57563cc011350b1786efe9e18 (patch) | |
| tree | 2774c1496435ea5e46d2823b2edf5b551a387a92 | |
| parent | 7270da76bae70172b413ad4a65176ea23df00be6 (diff) | |
| parent | 4c33c60500d9452922f8bda00c3470acc3903712 (diff) | |
| download | redot-engine-01a80647607df9e57563cc011350b1786efe9e18.tar.gz | |
Merge pull request #83583 from anrp/anrp/gdvirtboth
Allow coexistence of GDScript and GDExtension virtual methods in the same object
| -rw-r--r-- | core/object/make_virtuals.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/object/make_virtuals.py b/core/object/make_virtuals.py index 0f3cf3916a..79a8df6c8a 100644 --- a/core/object/make_virtuals.py +++ b/core/object/make_virtuals.py @@ -47,8 +47,8 @@ _FORCE_INLINE_ bool _gdvirtual_##m_name##_call($CALLARGS) $CONST { \\ }\\ _FORCE_INLINE_ bool _gdvirtual_##m_name##_overridden() const { \\ ScriptInstance *_script_instance = ((Object*)(this))->get_script_instance();\\ - if (_script_instance) {\\ - return _script_instance->has_method(_gdvirtual_##m_name##_sn);\\ + if (_script_instance && _script_instance->has_method(_gdvirtual_##m_name##_sn)) {\\ + return true;\\ }\\ if (unlikely(_get_extension() && !_gdvirtual_##m_name##_initialized)) {\\ _gdvirtual_##m_name = nullptr;\\ |