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

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

Fix GDExtension hot reload for classes not created via `ClassDB::instantiate()`
This commit is contained in:
Rémi Verschelde 2024-04-19 16:27:26 +02:00
parent 1bd6fe81ea 87aec2745d
commit 0b8042180e
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/object/class_db.cpp
View File

@ -182,8 +182,20 @@ public:
// Construct a placeholder.
Object *obj = native_parent->creation_func();
// ClassDB::set_object_extension_instance() won't be called for placeholders.
// We need need to make sure that all the things it would have done (even if
// done in a different way to support placeholders) will also be done here.
obj->_extension = ClassDB::get_placeholder_extension(ti->name);
obj->_extension_instance = memnew(PlaceholderExtensionInstance(ti->name));
#ifdef TOOLS_ENABLED
if (obj->_extension->track_instance) {
obj->_extension->track_instance(obj->_extension->tracking_userdata, obj);
}
#endif
return obj;
}
@ -506,14 +518,7 @@ Object *ClassDB::_instantiate_internal(const StringName &p_class, bool p_require
extension = get_placeholder_extension(ti->name);
}
#endif
Object *obj = (Object *)extension->create_instance(extension->class_userdata);
#ifdef TOOLS_ENABLED
if (extension->track_instance) {
extension->track_instance(extension->tracking_userdata, obj);
}
#endif
return obj;
return (Object *)extension->create_instance(extension->class_userdata);
} else {
#ifdef TOOLS_ENABLED
if (!p_require_real_class && ti->is_runtime && Engine::get_singleton()->is_editor_hint()) {
@ -638,6 +643,12 @@ void ClassDB::set_object_extension_instance(Object *p_object, const StringName &
p_object->_extension = ti->gdextension;
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) {