diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-04-27 08:09:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-27 08:09:01 +0200 |
| commit | ed583ffa30b6ab316e082a43188a6aa2dc10c03a (patch) | |
| tree | 461456c23fbe66890a1ed2d8c6ad806b85e5903f | |
| parent | f045efe007cffb87238ee519b7f33d710814ded7 (diff) | |
| parent | c530d8f43cdeba26aeb87e61e66ab24e9ade9121 (diff) | |
Merge pull request #8553 from Hinsbart/vs_fix
Fix recognition of resource extensions.
| -rw-r--r-- | core/class_db.cpp | 2 | ||||
| -rw-r--r-- | editor/property_editor.cpp | 1 |
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()); } |