summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Haas <liu.gam3@gmail.com>2017-04-26 23:06:59 +0200
committerAndreas Haas <liu.gam3@gmail.com>2017-04-26 23:07:23 +0200
commitc530d8f43cdeba26aeb87e61e66ab24e9ade9121 (patch)
tree660348e7707e6353f0cf829cbdb7b0cd337e4ad3
parent02c041904f7ced28cd2a006c09725fd9fd60520f (diff)
Fix recognition of resource extensions.
Also removes a related debug print.
-rw-r--r--core/class_db.cpp2
-rw-r--r--editor/property_editor.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/core/class_db.cpp b/core/class_db.cpp
index 0ca982303d..1fe02c8cd9 100644
--- a/core/class_db.cpp
+++ b/core/class_db.cpp
@@ -1196,7 +1196,7 @@ void ClassDB::get_extensions_for_type(const StringName &p_class, List<String> *p
while ((K = resource_base_extensions.next(K))) {
StringName cmp = resource_base_extensions[*K];
- if (is_parent_class(p_class, cmp))
+ if (is_parent_class(p_class, cmp) || is_parent_class(cmp, p_class))
p_extensions->push_back(*K);
}
}
diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp
index 666bfa20b5..f0717f1e6b 100644
--- a/editor/property_editor.cpp
+++ b/editor/property_editor.cpp
@@ -116,7 +116,6 @@ void CustomPropertyEditor::_menu_option(int p_which) {
Set<String> valid_extensions;
for (List<String>::Element *E = extensions.front(); E; E = E->next()) {
- print_line("found: " + E->get());
valid_extensions.insert(E->get());
}