diff --git a/Build/SlimDX.dll b/Build/SlimDX.dll index c02903f6e1326ca22b4663d9a187b5f290041acd..ca05cbd716feae38ae43f2f25f5cb870ac574390 100755 Binary files a/Build/SlimDX.dll and b/Build/SlimDX.dll differ diff --git a/Build/Updater.ini b/Build/Updater.ini index fe4d499e58f216c92d86437a32e75c25ebe2dd02..688eb2eaa2eb02afd5d6d5c16ff30cd48c09d2f8 100755 --- a/Build/Updater.ini +++ b/Build/Updater.ini @@ -1,4 +1,4 @@ URL http://devbuilds.drdteam.org/gzdbbf/ FileName Builder.exe -UpdateName GZDoom_Builder_Bugfix-r[REVNUM].7z -UpdaterName GZDB_Updater-x86.7z \ No newline at end of file +UpdateName GZDoom_Builder_Bugfix-r[REVNUM]-x64.7z +UpdaterName GZDB_Updater-x64.7z \ No newline at end of file diff --git a/Source/Core/Properties/AssemblyInfo.cs b/Source/Core/Properties/AssemblyInfo.cs index 700e47ddebacd282304d71c6194be525975f0fde..12473ac32189192675d99b30a473e133052d3891 100755 --- a/Source/Core/Properties/AssemblyInfo.cs +++ b/Source/Core/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using CodeImp.DoomBuilder; // Build Number // Revision // -[assembly: AssemblyVersion("2.3.0.3029")] +[assembly: AssemblyVersion("2.3.0.3030")] [assembly: NeutralResourcesLanguageAttribute("en")] -[assembly: AssemblyHash("3c433cf")] +[assembly: AssemblyHash("b026e58")] diff --git a/Source/Core/Rendering/Renderer3D.cs b/Source/Core/Rendering/Renderer3D.cs index d7fae250bfa1dad758624e1765a235d4c1c2e759..46a412dc247ddc582ac5c69fbe926313490c3d7b 100755 --- a/Source/Core/Rendering/Renderer3D.cs +++ b/Source/Core/Rendering/Renderer3D.cs @@ -964,6 +964,7 @@ namespace CodeImp.DoomBuilder.Rendering // [ZZ] apply desaturation if (t.Thing.Sector != null) graphics.Shaders.World3D.Desaturation = t.Thing.Sector.Desaturation; + else graphics.Shaders.World3D.Desaturation = 0; // Apply changes ApplyMatrices3D(); @@ -1661,8 +1662,10 @@ namespace CodeImp.DoomBuilder.Rendering if (t.Thing.Sector != null) graphics.Shaders.World3D.LightColor = t.Thing.Sector.FogColor; graphics.Shaders.World3D.CameraPosition = new Vector4(cameraposition.x, cameraposition.y, cameraposition.z, t.FogFactor); } - - graphics.Shaders.World3D.Desaturation = t.Thing.Sector.Desaturation; + + if (t.Thing.Sector != null) + graphics.Shaders.World3D.Desaturation = t.Thing.Sector.Desaturation; + else graphics.Shaders.World3D.Desaturation = 0; GZModel model = General.Map.Data.ModeldefEntries[t.Thing.Type].Model; for (int j = 0; j < model.Meshes.Count; j++) diff --git a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs index a2e2fca8bd0425f782c6b8817dd54591a55f223e..7d26e4f0a30f75e6bfd2f19ff0be4aa8653d6500 100755 --- a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs +++ b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Resources; // Build Number // Revision // -[assembly: AssemblyVersion("2.3.0.3029")] +[assembly: AssemblyVersion("2.3.0.3030")] [assembly: NeutralResourcesLanguageAttribute("en")]