Explorar el Código

Allow coexistance of GDScript and GDExtension virtual methods in the same object

Resolves https://github.com/godotengine/godot-cpp/issues/1224
anrp hace 1 año
padre
commit
4c33c60500
Se han modificado 1 ficheros con 2 adiciones y 2 borrados
  1. 2 2
      core/object/make_virtuals.py

+ 2 - 2
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 { \\
 _FORCE_INLINE_ bool _gdvirtual_##m_name##_overridden() const { \\
 	ScriptInstance *_script_instance = ((Object*)(this))->get_script_instance();\\
 	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)) {\\
     if (unlikely(_get_extension() && !_gdvirtual_##m_name##_initialized)) {\\
          _gdvirtual_##m_name = nullptr;\\
          _gdvirtual_##m_name = nullptr;\\