auto keyword removal, meta cleanup, saving case fix, review

Author: yahkr

editor/import/3d/resource_importer_scene.cpp

@@ -1483,8 +1483,10 @@ Node *ResourceImporterScene::_post_fix_node(Node *p_node, Node *p_root, HashMap<
 	}
 
 	if (!isroot && node_settings.has("import/exposed")) {
-		p_node->set_meta(META_EXPOSED_IN_OWNER, bool(node_settings["import/exposed"]));
-		p_node->get_owner()->set_meta(META_CONTAINS_EXPOSED_NODES, true);
+		if (bool(node_settings["import/exposed"])) {
+			p_node->set_meta(META_EXPOSED_IN_OWNER, true);
+			p_node->get_owner()->set_meta(META_CONTAINS_EXPOSED_NODES, true);
+		}
 	}
 
 	if (Object::cast_to<ImporterMeshInstance3D>(p_node)) {
@@ -2781,7 +2783,9 @@ Node *ResourceImporterScene::_generate_meshes(Node *p_node, const Dictionary &p_
 				mesh_node->set_gi_mode(GeometryInstance3D::GI_MODE_STATIC);
 			} break;
 		}
-		mesh_node->set_meta(META_EXPOSED_IN_OWNER, src_mesh_node->has_meta(META_EXPOSED_IN_OWNER));
+		if (src_mesh_node->has_meta(META_EXPOSED_IN_OWNER)) {
+			mesh_node->set_meta(META_EXPOSED_IN_OWNER, true);
+		}
 		if (mesh_node->get_owner() != nullptr) {
 			mesh_node->get_owner()->set_meta(META_CONTAINS_EXPOSED_NODES, src_mesh_node->has_meta(META_EXPOSED_IN_OWNER));
 		}

editor/scene/scene_tree_editor.cpp

@@ -325,7 +325,7 @@ void SceneTreeEditor::_update_exposed_nodes(Node *p_node, TreeItem *p_parent, bo
 		if (child->has_meta(META_EXPOSED_IN_OWNER) || child->has_meta(META_EXPOSED_IN_INSTANCE)) {
 			_update_node_subtree(child, p_parent, p_force);
 
-			if (auto CI = node_cache.get(child)) {
+			if (HashMap<Node *, CachedNode>::Iterator CI = node_cache.get(child)) {
 				TreeItem *ti = CI->value.item;
 
 				if (p_last_inserted) {
@@ -398,7 +398,7 @@ void SceneTreeEditor::_update_node_subtree(Node *p_node, TreeItem *p_parent, boo
 			if (p_node->has_meta(META_EXPOSED_IN_INSTANCE)) {
 				int final_idx = 0;
 				for (int i = 0; i < p_parent->get_child_count(); i++) {
-					if (p_parent->get_child(i)->is_exposed() && p_parent->get_child(i) != I->value.item) {
+					if (p_parent->get_child(i)->has_meta(META_EXPOSED_TREE_ITEM) && p_parent->get_child(i) != I->value.item) {
 						final_idx++;
 					}
 				}
@@ -889,7 +889,7 @@ void SceneTreeEditor::_move_node_children(HashMap<Node *, CachedNode>::Iterator
 		TreeItem *TI = item->get_child(i);
 		HashMap<Node *, CachedNode>::Iterator CI = node_cache.find_by_item(TI);
 		Node *n = CI->key;
-		if (TI->is_exposed()) {
+		if (TI->has_meta(META_EXPOSED_TREE_ITEM)) {
 			ordered_children.push_back(n);
 		}
 	}
@@ -2526,7 +2526,7 @@ HashMap<Node *, SceneTreeEditor::CachedNode>::Iterator SceneTreeEditor::NodeCach
 		return HashMap<Node *, CachedNode>::Iterator();
 	}
 	if (p_node->has_meta(META_EXPOSED_IN_INSTANCE)) {
-		p_item->set_exposed(true);
+		p_item->set_meta(META_EXPOSED_TREE_ITEM, true);
 	}
 	return cache.insert(p_node, CachedNode(p_node, p_item));
 }
@@ -2559,7 +2559,7 @@ HashMap<Node *, SceneTreeEditor::CachedNode>::Iterator SceneTreeEditor::NodeCach
 
 HashMap<Node *, SceneTreeEditor::CachedNode>::Iterator
 SceneTreeEditor::NodeCache::find_by_item(TreeItem *p_item) {
-	for (auto I = cache.begin(); I; ++I) {
+	for (HashMap<Node *, CachedNode>::Iterator I = cache.begin(); I; ++I) {
 		if (I->value.item == p_item) {
 			return I;
 		}

scene/gui/tree.cpp

@@ -839,17 +839,6 @@ bool TreeItem::is_visible_in_tree() const {
 	return visible && parent_visible_in_tree;
 }
 
-void TreeItem::set_exposed(bool p_exposed) {
-	if (exposed == p_exposed) {
-		return;
-	}
-	exposed = p_exposed;
-}
-
-bool TreeItem::is_exposed() const {
-	return exposed;
-}
-
 void TreeItem::_handle_visibility_changed(bool p_visible) {
 	TreeItem *child = get_first_child();
 	while (child) {

scene/gui/tree.h

@@ -355,9 +355,6 @@ class TreeItem : public Object {
 	bool is_visible();
 	bool is_visible_in_tree() const;
 
-	void set_exposed(bool p_exposed);
-	bool is_exposed() const;
-
 	void uncollapse_tree();
 
 	void set_custom_minimum_height(int p_height);
@@ -932,3 +929,5 @@ class Tree : public Control {
 
 VARIANT_ENUM_CAST(Tree::SelectMode);
 VARIANT_ENUM_CAST(Tree::DropModeFlags);
+
+#define META_EXPOSED_TREE_ITEM "_exposed_tree_item"

scene/main/node.cpp

@@ -2304,7 +2304,7 @@ int Node::get_exposed_node_count(Node *p_owner, bool p_recursive) {
 		if (!KV.value->data.owner) {
 			continue;
 		}
-		if (this == p_owner && KV.value->get_import_path().is_empty() && KV.value->has_exposed_nodes()) {
+		if (this == p_owner && KV.value->is_part_of_edited_scene() && KV.value->has_exposed_nodes()) {
 			count--;
 		}
 		if (KV.value->has_meta(META_EXPOSED_IN_INSTANCE)) {

scene/resources/packed_scene.cpp

@@ -856,7 +856,7 @@ Error SceneState::_parse_node(Node *p_owner, Node *p_node, int p_parent_idx, Has
 		if (p_node->has_exposed_nodes()) {
 			for (int i = 0; i < p_node->get_child_count(); i++) {
 				Node *c = p_node->get_child(i);
-				Error err = _parse_node(p_owner, c, NO_PARENT_SAVED, name_map, variant_map, node_map, nodepath_map);
+				Error err = _parse_node(p_owner, c, NO_PARENT_SAVED, name_map, variant_map, node_map, nodepath_map, ids_saved);
 				if (err) {
 					return err;
 				}
@@ -879,7 +879,7 @@ Error SceneState::_parse_node(Node *p_owner, Node *p_node, int p_parent_idx, Has
 	}
 
 	// Save the nodes that are chosen as exposed, so they can be restored on load.
-	if (p_node->has_meta(META_MARKED_FOR_EXPOSURE) || (p_node->has_meta(META_EXPOSED_IN_OWNER) && p_node->get_owner() == p_owner)) {
+	if (p_node->has_meta(META_MARKED_FOR_EXPOSURE) && (p_node->has_meta(META_EXPOSED_IN_OWNER) && p_node->get_owner() == p_owner)) {
 		exposed_nodes.push_back(p_owner->get_path_to(p_node));
 	}