3 files changed, 27 insertions, 18 deletions

diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp
index 991d012d59..62eb06874c 100644
--- a/editor/plugins/visual_shader_editor_plugin.cpp
+++ b/editor/plugins/visual_shader_editor_plugin.cpp
@@ -690,19 +690,7 @@ void VisualShaderEditor::edit(VisualShader *p_visual_shader) {
 		}
 #endif
 		visual_shader->set_graph_offset(graph->get_scroll_ofs() / EDSCALE);
-
-		if (visual_shader->get_mode() == VisualShader::MODE_PARTICLES) {
-			edit_type_standart->set_visible(false);
-			edit_type_particles->set_visible(true);
-			edit_type = edit_type_particles;
-			particles_mode = true;
-		} else {
-			edit_type_particles->set_visible(false);
-			edit_type_standart->set_visible(true);
-			edit_type = edit_type_standart;
-			particles_mode = false;
-		}
-		visual_shader->set_shader_type(get_current_shader_type());
+		_set_mode(visual_shader->get_mode());
 	} else {
 		if (visual_shader.is_valid()) {
 			if (visual_shader->is_connected("changed", callable_mp(this, &VisualShaderEditor::_update_preview))) {
@@ -1010,6 +998,21 @@ void VisualShaderEditor::_update_options_menu() {
 	}
 }
 
+void VisualShaderEditor::_set_mode(int p_which) {
+	if (p_which == VisualShader::MODE_PARTICLES) {
+		edit_type_standart->set_visible(false);
+		edit_type_particles->set_visible(true);
+		edit_type = edit_type_particles;
+		particles_mode = true;
+	} else {
+		edit_type_particles->set_visible(false);
+		edit_type_standart->set_visible(true);
+		edit_type = edit_type_standart;
+		particles_mode = false;
+	}
+	visual_shader->set_shader_type(get_current_shader_type());
+}
+
 Size2 VisualShaderEditor::get_minimum_size() const {
 	return Size2(10, 200);
 }
@@ -2308,7 +2311,7 @@ void VisualShaderEditor::_delete_nodes() {
 }
 
 void VisualShaderEditor::_mode_selected(int p_id) {
-	visual_shader->set_shader_type(VisualShader::Type(p_id));
+	visual_shader->set_shader_type(particles_mode ? VisualShader::Type(p_id + 3) : VisualShader::Type(p_id));
 	_update_options_menu();
 	_update_graph();
 }
@@ -2611,6 +2614,7 @@ void VisualShaderEditor::_bind_methods() {
 	ClassDB::bind_method("_set_node_size", &VisualShaderEditor::_set_node_size);
 	ClassDB::bind_method("_clear_buffer", &VisualShaderEditor::_clear_buffer);
 	ClassDB::bind_method("_update_uniforms", &VisualShaderEditor::_update_uniforms);
+	ClassDB::bind_method("_set_mode", &VisualShaderEditor::_set_mode);
 
 	ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &VisualShaderEditor::get_drag_data_fw);
 	ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &VisualShaderEditor::can_drop_data_fw);
@@ -3628,6 +3632,10 @@ void EditorPropertyShaderMode::_option_selected(int p_which) {
 	//do is easy
 	undo_redo->add_do_method(visual_shader.ptr(), "set_mode", p_which);
 	undo_redo->add_undo_method(visual_shader.ptr(), "set_mode", visual_shader->get_mode());
+
+	undo_redo->add_do_method(VisualShaderEditor::get_singleton(), "_set_mode", p_which);
+	undo_redo->add_undo_method(VisualShaderEditor::get_singleton(), "_set_mode", visual_shader->get_mode());
+
 	//now undo is hell
 
 	//1. restore connections to output
diff --git a/editor/plugins/visual_shader_editor_plugin.h b/editor/plugins/visual_shader_editor_plugin.h
index c961a05f45..e5e4add6a2 100644
--- a/editor/plugins/visual_shader_editor_plugin.h
+++ b/editor/plugins/visual_shader_editor_plugin.h
@@ -251,6 +251,7 @@ class VisualShaderEditor : public VBoxContainer {
 	void _add_texture_node(const String &p_path);
 	VisualShaderNode *_add_node(int p_idx, int p_op_idx = -1);
 	void _update_options_menu();
+	void _set_mode(int p_which);
 
 	void _show_preview_text();
 	void _update_preview();
diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h
index 17534cbbc8..562f4768ae 100644
--- a/scene/gui/text_edit.h
+++ b/scene/gui/text_edit.h
@@ -79,10 +79,10 @@ private:
 		struct Line {
 			Vector<Gutter> gutters;
 
-			int width_cache : 24;
-			bool marked : 1;
-			bool hidden : 1;
-			int wrap_amount_cache : 24;
+			int32_t width_cache;
+			bool marked;
+			bool hidden;
+			int32_t wrap_amount_cache;
 			String data;
 			Line() {
 				width_cache = 0;