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

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

Browse source 
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
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
editor/editor_folding.cpp
View file

@ -112,14 +112,16 @@ void EditorFolding::_fill_folds(const Node *p_root, const Node *p_node, Array &p
List<PropertyInfo> plist; List<PropertyInfo> plist;
p_node->get_property_list(&plist); p_node->get_property_list(&plist);
for (List<PropertyInfo>::Element *E = plist.front(); E; E = E->next()) { for (List<PropertyInfo>::Element *E = plist.front(); E; E = E->next()) {
if (E->get().type == Variant::OBJECT) { if (E->get().usage & PROPERTY_USAGE_EDITOR) {
RES res = p_node->get(E->get().name); if (E->get().type == Variant::OBJECT) {
if (res.is_valid() && !resources.has(res) && res->get_path() != String() && !res->get_path().is_resource_file()) { 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()) {
PoolVector<String> res_unfolds = _get_unfolds(res.ptr()); PoolVector<String> res_unfolds = _get_unfolds(res.ptr());
resource_folds.push_back(res->get_path()); resource_folds.push_back(res->get_path());
resource_folds.push_back(res_unfolds); resource_folds.push_back(res_unfolds);
resources.insert(res); resources.insert(res);
}
} }
} }
} }