Merge pull request #27894 from nekomatata/fix-particle-errors

EditorFolding ignores hidden properties for folded resources
This commit is contained in:
Rémi Verschelde 2019-04-11 09:42:10 +02:00 committed by GitHub
commit 2ddb41a5d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -112,6 +112,7 @@ void EditorFolding::_fill_folds(const Node *p_root, const Node *p_node, Array &p
List<PropertyInfo> plist;
p_node->get_property_list(&plist);
for (List<PropertyInfo>::Element *E = plist.front(); E; E = E->next()) {
if (E->get().usage & PROPERTY_USAGE_EDITOR) {
if (E->get().type == Variant::OBJECT) {
RES res = p_node->get(E->get().name);
if (res.is_valid() && !resources.has(res) && res->get_path() != String() && !res->get_path().is_resource_file()) {
@ -123,6 +124,7 @@ void EditorFolding::_fill_folds(const Node *p_root, const Node *p_node, Array &p
}
}
}
}
for (int i = 0; i < p_node->get_child_count(); i++) {
_fill_folds(p_root, p_node->get_child(i), p_folds, resource_folds, resources);