2 files changed, 36 insertions, 18 deletions

diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp
index fd21b83605..0a3e2da5e9 100644
--- a/editor/scene_tree_editor.cpp
+++ b/editor/scene_tree_editor.cpp
@@ -69,24 +69,10 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item, int p_column, int p_i
 			emit_signal("open_script", script);
 
 	} else if (p_id == BUTTON_VISIBILITY) {
-
-		if (n->is_class("Spatial")) {
-
-			bool v = bool(n->call("is_visible"));
-			undo_redo->create_action(TTR("Toggle Spatial Visible"));
-			undo_redo->add_do_method(n, "set_visible", !v);
-			undo_redo->add_undo_method(n, "set_visible", v);
-			undo_redo->commit_action();
-
-		} else if (n->is_class("CanvasItem")) {
-
-			bool v = bool(n->call("is_visible"));
-			undo_redo->create_action(TTR("Toggle CanvasItem Visible"));
-			undo_redo->add_do_method(n, v ? "hide" : "show");
-			undo_redo->add_undo_method(n, v ? "show" : "hide");
-			undo_redo->commit_action();
-		}
-
+		undo_redo->create_action(TTR("Toggle Visible"));
+		undo_redo->add_do_method(this, "toggle_visible", n);
+		undo_redo->add_undo_method(this, "toggle_visible", n);
+		undo_redo->commit_action();
 	} else if (p_id == BUTTON_LOCK) {
 
 		if (n->is_class("CanvasItem") || n->is_class("Spatial")) {
@@ -131,7 +117,34 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item, int p_column, int p_i
 		NodeDock::singleton->show_groups();
 	}
 }
+void SceneTreeEditor::_toggle_visible(Node *p_node) {
+	if (p_node->is_class("Spatial")) {
+		bool v = bool(p_node->call("is_visible"));
+		p_node->call("set_visible", !v);
+	} else if (p_node->is_class("CanvasItem")) {
+		bool v = bool(p_node->call("is_visible"));
+		if (v) {
+			p_node->call("hide");
+		} else {
+			p_node->call("show");
+		}
+	}
+}
 
+void SceneTreeEditor::toggle_visible(Node *p_node) {
+	_toggle_visible(p_node);
+	List<Node *> selection = editor_selection->get_selected_node_list();
+	if (selection.size() > 1) {
+		for (List<Node *>::Element *E = selection.front(); E; E = E->next()) {
+			Node *nv = E->get();
+			ERR_FAIL_COND(!nv);
+			if (nv == p_node) {
+				continue;
+			}
+			_toggle_visible(nv);
+		}
+	}
+}
 bool SceneTreeEditor::_add_nodes(Node *p_node, TreeItem *p_parent) {
 
 	if (!p_node)
@@ -949,6 +962,8 @@ void SceneTreeEditor::_bind_methods() {
 	ClassDB::bind_method("_cell_collapsed", &SceneTreeEditor::_cell_collapsed);
 	ClassDB::bind_method("_rmb_select", &SceneTreeEditor::_rmb_select);
 	ClassDB::bind_method("_warning_changed", &SceneTreeEditor::_warning_changed);
+	ClassDB::bind_method("_toggle_visible", &SceneTreeEditor::_toggle_visible);
+	ClassDB::bind_method("toggle_visible", &SceneTreeEditor::toggle_visible);
 
 	ClassDB::bind_method("_node_script_changed", &SceneTreeEditor::_node_script_changed);
 	ClassDB::bind_method("_node_visibility_changed", &SceneTreeEditor::_node_visibility_changed);
diff --git a/editor/scene_tree_editor.h b/editor/scene_tree_editor.h
index 45194bb81d..b63eb2a1f0 100644
--- a/editor/scene_tree_editor.h
+++ b/editor/scene_tree_editor.h
@@ -70,6 +70,8 @@ class SceneTreeEditor : public Control {
 
 	void _compute_hash(Node *p_node, uint64_t &hash);
 
+	void toggle_visible(Node *p_node);
+
 	bool _add_nodes(Node *p_node, TreeItem *p_parent);
 	void _test_update_tree();
 	void _update_tree();
@@ -103,6 +105,7 @@ class SceneTreeEditor : public Control {
 	static void _bind_methods();
 
 	void _cell_button_pressed(Object *p_item, int p_column, int p_id);
+	void _toggle_visible(Node *p_node);
 	void _cell_multi_selected(Object *p_object, int p_cell, bool p_selected);
 	void _update_selection(TreeItem *item);
 	void _node_script_changed(Node *p_node);