diff options
| author | George Marques <george@gmarqu.es> | 2021-08-17 22:11:11 -0300 |
|---|---|---|
| committer | George Marques <george@gmarqu.es> | 2021-08-17 22:11:11 -0300 |
| commit | 3b593b596e2fadb2dd3be3fa772c208ce1bb5ed4 (patch) | |
| tree | 1ab56eb2f1a86d24dc076fda78e4d09653dc8d7a | |
| parent | fcfea84d5e5e000e24bbe53858af922af8be6f80 (diff) | |
Properly set up virtual calls for extensions
| -rw-r--r-- | core/extension/native_extension.cpp | 1 | ||||
| -rw-r--r-- | core/object/make_virtuals.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/extension/native_extension.cpp b/core/extension/native_extension.cpp index b2f9257f82..0556c9c84d 100644 --- a/core/extension/native_extension.cpp +++ b/core/extension/native_extension.cpp @@ -154,6 +154,7 @@ void NativeExtension::_register_extension_class(const GDNativeExtensionClassLibr extension->native_extension.create_instance = p_extension_funcs->create_instance_func; extension->native_extension.set_object_instance = p_extension_funcs->object_instance_func; extension->native_extension.free_instance = p_extension_funcs->free_instance_func; + extension->native_extension.get_virtual = p_extension_funcs->get_virtual_func; ClassDB::register_extension_class(&extension->native_extension); } diff --git a/core/object/make_virtuals.py b/core/object/make_virtuals.py index 2c6b8cddc9..9948620c73 100644 --- a/core/object/make_virtuals.py +++ b/core/object/make_virtuals.py @@ -1,8 +1,8 @@ proto = """ #define GDVIRTUAL$VER($RET m_name $ARG) \\ -GDNativeExtensionClassCallVirtual _gdvirtual_##m_name = (_get_extension() && _get_extension()->get_virtual) ? _get_extension()->get_virtual(_get_extension()->class_userdata, #m_name) : (GDNativeExtensionClassCallVirtual) nullptr;\\ StringName _gdvirtual_##m_name##_sn = #m_name;\\ bool _gdvirtual_##m_name##_call($CALLARGS) $CONST { \\ + GDNativeExtensionClassCallVirtual _gdvirtual_##m_name = (_get_extension() && _get_extension()->get_virtual) ? _get_extension()->get_virtual(_get_extension()->class_userdata, #m_name) : (GDNativeExtensionClassCallVirtual) nullptr;\\ ScriptInstance *script_instance = ((Object*)(this))->get_script_instance();\\ if (script_instance) {\\ Callable::CallError ce; \\ |