Browse Source

EditorFolding ignores hidden properties for folded resources (fixes #26663)

(cherry picked from commit 790a78273f1d7e0f3588e0aea789c3f1c92206c7)
PouleyKetchoupp 6 years ago
parent
commit
d0c5dc77f3
1 changed files with 10 additions and 8 deletions
  1. 10 8
      editor/editor_folding.cpp

+ 10 - 8
editor/editor_folding.cpp

@@ -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) {
-			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());
-				resource_folds.push_back(res->get_path());
-				resource_folds.push_back(res_unfolds);
-				resources.insert(res);
+		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()) {
+
+					PoolVector<String> res_unfolds = _get_unfolds(res.ptr());
+					resource_folds.push_back(res->get_path());
+					resource_folds.push_back(res_unfolds);
+					resources.insert(res);
+				}
 			}
 			}
 		}
 		}
 	}
 	}