diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-10 16:42:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-10 16:42:31 +0200 |
| commit | 46beaacec3d18c0d5f1d744e2c63ca09f5152c85 (patch) | |
| tree | e9520a708f1a8f65a829547c281f1cbedf38cca8 /core/object/object.cpp | |
| parent | 50d5569ad49752803b980eca85590f5362b12409 (diff) | |
| parent | ee6e05ee68afc7841848382fbd538fdf7369b214 (diff) | |
| download | redot-engine-46beaacec3d18c0d5f1d744e2c63ca09f5152c85.tar.gz | |
Merge pull request #51017 from vnen/extension-fixes
Diffstat (limited to 'core/object/object.cpp')
| -rw-r--r-- | core/object/object.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/object/object.cpp b/core/object/object.cpp index d552d5e5e0..c191109a8f 100644 --- a/core/object/object.cpp +++ b/core/object/object.cpp @@ -1815,7 +1815,7 @@ void Object::_construct_object(bool p_reference) { type_is_reference = p_reference; _instance_id = ObjectDB::add_instance(this); - ClassDB::instance_get_native_extension_data(&_extension, &_extension_instance); + ClassDB::instance_get_native_extension_data(&_extension, &_extension_instance, this); #ifdef DEBUG_ENABLED _lock_index.init(1); @@ -1876,7 +1876,7 @@ Object::~Object() { if (_instance_bindings != nullptr) { for (uint32_t i = 0; i < _instance_binding_count; i++) { if (_instance_bindings[i].free_callback) { - _instance_bindings[i].free_callback(_instance_bindings[i].token, _instance_bindings[i].binding, this); + _instance_bindings[i].free_callback(_instance_bindings[i].token, this, _instance_bindings[i].binding); } } memfree(_instance_bindings); |