diff --git a/Barotrauma/BarotraumaShared/Content/damageshader.fx b/Barotrauma/BarotraumaShared/Content/damageshader.fx index 1fd8ed773..8444fd9c6 100644 --- a/Barotrauma/BarotraumaShared/Content/damageshader.fx +++ b/Barotrauma/BarotraumaShared/Content/damageshader.fx @@ -5,7 +5,7 @@ sampler TextureSampler : register (s0) = sampler_state { Texture = ; } Texture2D xStencil; sampler StencilSampler = sampler_state { Texture = ; }; -float4 color; +float4 inColor; float aCutoff; float aMultiplier; @@ -15,7 +15,7 @@ float cMultiplier; float4 main(float4 position : SV_Position, float4 color : COLOR0, float2 texCoord : TEXCOORD0) : COLOR0 { - float4 c = xTexture.Sample(TextureSampler, texCoord) * color; + float4 c = xTexture.Sample(TextureSampler, texCoord) * inColor; float4 stencilColor = xStencil.Sample(StencilSampler, texCoord); diff --git a/Barotrauma/BarotraumaShared/Content/damageshader.xnb b/Barotrauma/BarotraumaShared/Content/damageshader.xnb index 5d3aad9e7..645deb750 100644 Binary files a/Barotrauma/BarotraumaShared/Content/damageshader.xnb and b/Barotrauma/BarotraumaShared/Content/damageshader.xnb differ diff --git a/Barotrauma/BarotraumaShared/Content/damageshader_opengl.fx b/Barotrauma/BarotraumaShared/Content/damageshader_opengl.fx index 72c4f7dd7..c50fe7fb9 100644 --- a/Barotrauma/BarotraumaShared/Content/damageshader_opengl.fx +++ b/Barotrauma/BarotraumaShared/Content/damageshader_opengl.fx @@ -5,7 +5,7 @@ sampler TextureSampler : register (s0) = sampler_state { Texture = ; } Texture xStencil; sampler StencilSampler = sampler_state { Texture = ; }; -float4 color; +float4 inColor; float aCutoff; float aMultiplier; @@ -15,7 +15,7 @@ float cMultiplier; float4 main(float4 position : SV_Position, float4 color : COLOR0, float2 texCoord : TEXCOORD0) : COLOR0 { - float4 c = tex2D(TextureSampler, texCoord) * color; + float4 c = tex2D(TextureSampler, texCoord) * inColor; float4 stencilColor = tex2D(StencilSampler, texCoord); diff --git a/Barotrauma/BarotraumaShared/Content/damageshader_opengl.xnb b/Barotrauma/BarotraumaShared/Content/damageshader_opengl.xnb index bcca611d3..d94d72e73 100644 Binary files a/Barotrauma/BarotraumaShared/Content/damageshader_opengl.xnb and b/Barotrauma/BarotraumaShared/Content/damageshader_opengl.xnb differ