diff --git a/Source/Core/Rendering/Renderer2D.cs b/Source/Core/Rendering/Renderer2D.cs index 992b562..d94b9b0 100644 --- a/Source/Core/Rendering/Renderer2D.cs +++ b/Source/Core/Rendering/Renderer2D.cs @@ -160,7 +160,6 @@ namespace CodeImp.DoomBuilder.Rendering AlignX = TextAlignmentX.Center, AlignY = TextAlignmentY.Middle, Color = General.Colors.GetNiGHTSColor(8), - BackColor = General.Colors.Background, TransformCoords = true }; @@ -170,7 +169,6 @@ namespace CodeImp.DoomBuilder.Rendering AlignX = TextAlignmentX.Center, AlignY = TextAlignmentY.Middle, Color = General.Colors.GetNiGHTSColor(7), - BackColor = General.Colors.Background, TransformCoords = true }; diff --git a/Source/Core/Windows/MainForm.Designer.cs b/Source/Core/Windows/MainForm.Designer.cs index 3ef4476..a109c16 100644 --- a/Source/Core/Windows/MainForm.Designer.cs +++ b/Source/Core/Windows/MainForm.Designer.cs @@ -178,6 +178,7 @@ namespace CodeImp.DoomBuilder.Windows this.linedefcolorpresets = new System.Windows.Forms.ToolStripDropDownButton(); this.separatorfilters = new System.Windows.Forms.ToolStripSeparator(); this.separatorrendering = new System.Windows.Forms.ToolStripSeparator(); + this.separatorsrb2 = new System.Windows.Forms.ToolStripSeparator(); this.itemdynlightmodes = new System.Windows.Forms.ToolStripMenuItem(); this.itemnodynlights = new System.Windows.Forms.ToolStripMenuItem(); this.itemdynlights = new System.Windows.Forms.ToolStripMenuItem(); @@ -195,6 +196,7 @@ namespace CodeImp.DoomBuilder.Windows this.buttontogglegrid = new System.Windows.Forms.ToolStripButton(); this.buttontogglecomments = new System.Windows.Forms.ToolStripButton(); this.separatorfullbrightness = new System.Windows.Forms.ToolStripSeparator(); + this.separatorsrb2extras = new System.Windows.Forms.ToolStripSeparator(); this.buttonviewnormal = new System.Windows.Forms.ToolStripButton(); this.buttonviewbrightness = new System.Windows.Forms.ToolStripButton(); this.buttonviewfloors = new System.Windows.Forms.ToolStripButton(); @@ -806,12 +808,13 @@ namespace CodeImp.DoomBuilder.Windows this.seperatorviewviews, this.itemfullbrightness, this.itemtogglegrid, - this.itemrendernightspath, + this.itemtogglefixedthingsscale, + this.itemtogglecomments, + this.separatorrendering, + this.itemrendernightspath, this.itemrenderzoomtubes, this.itemrenderpolypreview, - this.itemtogglecomments, - this.itemtogglefixedthingsscale, - this.separatorrendering, + this.separatorsrb2, this.itemdynlightmodes, this.itemmodelmodes, this.itemtogglefog, @@ -1356,24 +1359,25 @@ namespace CodeImp.DoomBuilder.Windows this.buttontogglegrid, this.buttontogglecomments, this.buttontogglefixedthingsscale, - this.separatorfullbrightness, - this.buttonviewnormal, + this.separatorfullbrightness, + this.buttonviewnormal, this.buttonviewbrightness, this.buttonviewfloors, this.buttonviewceilings, - this.separatorgeomergemodes, + this.seperatorviews, + this.buttontogglenightspath, + this.buttontogglezoomtubes, + this.buttontogglepolypreview, + this.separatorsrb2extras, this.buttonmergegeoclassic, this.buttonmergegeo, this.buttonplacegeo, - this.seperatorviews, - this.buttonsnaptogrid, + this.separatorgeomergemodes, + this.buttonsnaptogrid, this.buttontoggledynamicgrid, this.buttonautomerge, this.buttonsplitjoinedsectors, this.buttonautoclearsidetextures, - this.buttontogglenightspath, - this.buttontogglezoomtubes, - this.buttontogglepolypreview, this.seperatorgeometry, this.dynamiclightmode, this.modelrendermode, @@ -1667,6 +1671,11 @@ namespace CodeImp.DoomBuilder.Windows this.separatorrendering.Name = "separatorrendering"; this.separatorrendering.Size = new System.Drawing.Size(270, 6); // + // separatorsrb2 + // + this.separatorsrb2.Name = "separatorsrb2"; + this.separatorsrb2.Size = new System.Drawing.Size(270, 6); + // // itemdynlightmodes // this.itemdynlightmodes.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1827,10 +1836,16 @@ namespace CodeImp.DoomBuilder.Windows this.buttontogglegrid.Tag = "builder_togglegrid"; this.buttontogglegrid.Text = "Render Grid"; this.buttontogglegrid.Click += new System.EventHandler(this.InvokeTaggedAction); - // - // buttontogglenightspath - // - this.buttontogglenightspath.Checked = true; + // + // separatorsrb2extras + // + this.separatorsrb2extras.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.separatorsrb2extras.Name = "separatorsrb2extras"; + this.separatorsrb2extras.Size = new System.Drawing.Size(6, 25); + // + // buttontogglenightspath + // + this.buttontogglenightspath.Checked = true; this.buttontogglenightspath.CheckOnClick = true; this.buttontogglenightspath.CheckState = System.Windows.Forms.CheckState.Checked; this.buttontogglenightspath.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -3087,8 +3102,10 @@ namespace CodeImp.DoomBuilder.Windows private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripButton buttonfullbrightness; private System.Windows.Forms.ToolStripSeparator separatorfullbrightness; + private System.Windows.Forms.ToolStripSeparator separatorsrb2extras; private System.Windows.Forms.ToolStripSeparator separatorfilters; private System.Windows.Forms.ToolStripSeparator separatorrendering; + private System.Windows.Forms.ToolStripSeparator separatorsrb2; private System.Windows.Forms.ToolStripMenuItem itemdynlightmodes; private System.Windows.Forms.ToolStripMenuItem itemnodynlights; private System.Windows.Forms.ToolStripMenuItem itemdynlights;