Skip to content

Commit d495408

Browse files
committed
Handle missing instance binding callbacks by finding the closest parent
1 parent 6f91356 commit d495408

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
@@ -310,7 +310,18 @@ GDExtensionClassCallVirtual ClassDB::get_virtual_func(void *p_userdata, GDExtens
310310

311311
const GDExtensionInstanceBindingCallbacks *ClassDB::get_instance_binding_callbacks(const StringName &p_class) {
312312
std::unordered_map<StringName, const GDExtensionInstanceBindingCallbacks *>::iterator callbacks_it = instance_binding_callbacks.find(p_class);
313-
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)));
313+
if (likely(callbacks_it != instance_binding_callbacks.end())) {
314+
return callbacks_it->second;
315+
}
316+
317+
// If we don't have an instance binding callback for the given class, find the closest parent where we do.
318+
StringName class_name = p_class;
319+
do {
320+
class_name = get_parent_class(class_name);
321+
ERR_FAIL_COND_V_MSG(class_name == StringName(), nullptr, String("Cannot find instance binding callbacks for class '{0}'.").format(Array::make(p_class)));
322+
callbacks_it = instance_binding_callbacks.find(class_name);
323+
} while (callbacks_it == instance_binding_callbacks.end());
324+
314325
return callbacks_it->second;
315326
}
316327

0 commit comments

Comments
 (0)