Skip to content

Commit 4539169

Browse files
committed
Handle missing instance binding callbacks by finding the closest parent
1 parent 2cfc6ea commit 4539169

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

src/core/class_db.cpp

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,18 @@ GDExtensionClassCallVirtual ClassDB::get_virtual_func(void *p_userdata, GDExtens
318318

319319
const GDExtensionInstanceBindingCallbacks *ClassDB::get_instance_binding_callbacks(const StringName &p_class) {
320320
std::unordered_map<StringName, const GDExtensionInstanceBindingCallbacks *>::iterator callbacks_it = instance_binding_callbacks.find(p_class);
321-
ERR_FAIL_COND_V_MSG(callbacks_it == instance_binding_callbacks.end(), nullptr, String("Cannot find instance binding callbacks for class '{0}'.").format(Array::make(p_class)));
321+
if (likely(callbacks_it != instance_binding_callbacks.end())) {
322+
return callbacks_it->second;
323+
}
324+
325+
// If we don't have an instance binding callback for the given class, find the closest parent where we do.
326+
StringName class_name = p_class;
327+
do {
328+
class_name = get_parent_class(class_name);
329+
ERR_FAIL_COND_V_MSG(class_name == StringName(), nullptr, String("Cannot find instance binding callbacks for class '{0}'.").format(Array::make(p_class)));
330+
callbacks_it = instance_binding_callbacks.find(class_name);
331+
} while (callbacks_it == instance_binding_callbacks.end());
332+
322333
return callbacks_it->second;
323334
}
324335

0 commit comments

Comments
 (0)