Merge pull request #83583 from anrp/anrp/gdvirtboth

Allow coexistence of GDScript and GDExtension virtual methods in the same object
godotengine · Oct 20, 2023 · 01a8064 · 01a8064
2 parents 7270da7 + 4c33c60
commit 01a8064
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/object/make_virtuals.py b/core/object/make_virtuals.py
@@ -47,8 +47,8 @@
 }\\
 _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;\\