@ Floor/Ceiling align modes pretty much complete

Source/Plugins/GZDoomEditing/ClassicModes/CeilingAlignMode.cs

@@ -53,6 +53,8 @@ namespace CodeImp.DoomBuilder.GZDoomEditing
 
 		#region ================== Variables
 
+		private ViewMode prevviewmode;
+
 		#endregion
 
 		#region ================== Properties
@@ -89,12 +91,24 @@ namespace CodeImp.DoomBuilder.GZDoomEditing
 		// Mode engages
 		public override void OnEngage()
 		{
+			prevviewmode = General.Map.Renderer2D.ViewMode;
+
 			base.OnEngage();
+			
+			General.Actions.InvokeAction("builder_viewmodeceilings");
 		}
 
 		// Mode disengages
 		public override void OnDisengage()
 		{
+			switch(prevviewmode)
+			{
+				case ViewMode.Normal: General.Actions.InvokeAction("builder_viewmodenormal"); break;
+				case ViewMode.FloorTextures: General.Actions.InvokeAction("builder_viewmodefloors"); break;
+				case ViewMode.CeilingTextures: General.Actions.InvokeAction("builder_viewmodeceilings"); break;
+				case ViewMode.Brightness: General.Actions.InvokeAction("builder_viewmodebrightness"); break;
+			}
+			
 			base.OnDisengage();
 		}
 

Source/Plugins/GZDoomEditing/ClassicModes/FloorAlignMode.cs

@@ -53,6 +53,8 @@ namespace CodeImp.DoomBuilder.GZDoomEditing
 
 		#region ================== Variables
 
+		private ViewMode prevviewmode;
+
 		#endregion
 
 		#region ================== Properties
@@ -89,12 +91,24 @@ namespace CodeImp.DoomBuilder.GZDoomEditing
 		// Mode engages
 		public override void OnEngage()
 		{
+			prevviewmode = General.Map.Renderer2D.ViewMode;
+
 			base.OnEngage();
+			
+			General.Actions.InvokeAction("builder_viewmodefloors");
 		}
 
 		// Mode disengages
 		public override void OnDisengage()
 		{
+			switch(prevviewmode)
+			{
+				case ViewMode.Normal: General.Actions.InvokeAction("builder_viewmodenormal"); break;
+				case ViewMode.FloorTextures: General.Actions.InvokeAction("builder_viewmodefloors"); break;
+				case ViewMode.CeilingTextures: General.Actions.InvokeAction("builder_viewmodeceilings"); break;
+				case ViewMode.Brightness: General.Actions.InvokeAction("builder_viewmodebrightness"); break;
+			}
+			
 			base.OnDisengage();
 		}