asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #8553 from Hinsbart/vs_fix

Browse source 
Fix recognition of resource extensions.
This commit is contained in:
Rémi Verschelde 2017-04-27 08:09:01 +02:00 committed by GitHub
commit ed583ffa30
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/class_db.cpp
View file

@ -1196,7 +1196,7 @@ void ClassDB::get_extensions_for_type(const StringName &p_class, List<String> *p
while ((K = resource_base_extensions.next(K))) { while ((K = resource_base_extensions.next(K))) {
StringName cmp = resource_base_extensions[*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); p_extensions->push_back(*K);
} }
} }

1
editor/property_editor.cpp
View file

@ -116,7 +116,6 @@ void CustomPropertyEditor::_menu_option(int p_which) {
Set<String> valid_extensions; Set<String> valid_extensions;
for (List<String>::Element *E = extensions.front(); E; E = E->next()) { for (List<String>::Element *E = extensions.front(); E; E = E->next()) {
print_line("found: " + E->get());
valid_extensions.insert(E->get()); valid_extensions.insert(E->get());
} }