godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #90449 from dsnopek/gdextension-hot-reload-not-classdb-instantiate-4.2 

[4.2] Fix GDExtension hot reload for classes not created via `ClassDB::instantiate()`
This commit is contained in:
Rémi Verschelde 2024-04-19 16:18:15 +02:00 committed by GitHub
parent c8356fb9d4 be64b0dc37
commit 2d93cb544c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/object/class_db.cpp
View File

@ -366,13 +366,7 @@ Object *ClassDB::instantiate(const StringName &p_class) {
} }
#endif #endif
if (ti->gdextension && ti->gdextension->create_instance) { if (ti->gdextension && ti->gdextension->create_instance) {
Object *obj = (Object *)ti->gdextension->create_instance(ti->gdextension->class_userdata); return (Object *)ti->gdextension->create_instance(ti->gdextension->class_userdata);
#ifdef TOOLS_ENABLED
if (ti->gdextension->track_instance) {
ti->gdextension->track_instance(ti->gdextension->tracking_userdata, obj);
}
#endif
return obj;
} else { } else {
return ti->creation_func(); return ti->creation_func();
} }
@ -396,6 +390,12 @@ void ClassDB::set_object_extension_instance(Object *p_object, const StringName &
p_object->_extension = ti->gdextension; p_object->_extension = ti->gdextension;
p_object->_extension_instance = p_instance; p_object->_extension_instance = p_instance;
#ifdef TOOLS_ENABLED
if (p_object->_extension->track_instance) {
p_object->_extension->track_instance(p_object->_extension->tracking_userdata, p_object);
}
#endif
} }
bool ClassDB::can_instantiate(const StringName &p_class) { bool ClassDB::can_instantiate(const StringName &p_class) {