summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-12-09 11:28:11 +0100
committerGitHub <noreply@github.com>2020-12-09 11:28:11 +0100
commit92c001ef0982dc42de3a0dca1df5ac234cbbe229 (patch)
treeebddcf02e6f75fb6900f38b750a7518f401cb0e0 /core
parent0c5d3b838c935e6121bcee57b83fa802d7058cc1 (diff)
parent3c3590522f6f51db353383f369e4a70932022206 (diff)
Merge pull request #43931 from bruvzg/ctl_comp_font
[Complex Text Layouts] Add compatibility for legacy Font resources.
Diffstat (limited to 'core')
-rw-r--r--core/object/class_db.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/object/class_db.cpp b/core/object/class_db.cpp
index dc28fa10de..f5171f60ec 100644
--- a/core/object/class_db.cpp
+++ b/core/object/class_db.cpp
@@ -243,8 +243,11 @@ HashMap<StringName, StringName> ClassDB::resource_base_extensions;
HashMap<StringName, StringName> ClassDB::compat_classes;
bool ClassDB::_is_parent_class(const StringName &p_class, const StringName &p_inherits) {
- StringName inherits = p_class;
+ if (!classes.has(p_class)) {
+ return false;
+ }
+ StringName inherits = p_class;
while (inherits.operator String().length()) {
if (inherits == p_inherits) {
return true;