diff --git a/WickedEngine/WickedEngineEditor.exe b/WickedEngine/WickedEngineEditor.exe index aee58bc60..61b8a3e7d 100644 Binary files a/WickedEngine/WickedEngineEditor.exe and b/WickedEngine/WickedEngineEditor.exe differ diff --git a/WickedEngine/qGrassPS_tiledforward.hlsl b/WickedEngine/qGrassPS_tiledforward.hlsl index 3e11ecfe7..cacd9c565 100644 --- a/WickedEngine/qGrassPS_tiledforward.hlsl +++ b/WickedEngine/qGrassPS_tiledforward.hlsl @@ -7,7 +7,7 @@ float4 main(QGS_OUT PSIn) : SV_Target { float4 color = texture_0.Sample(sampler_linear_clamp,PSIn.tex); clip(color.a - 1.0f / 256.0f); // cancel heaviest overdraw for the alpha composition effect - float opacity = color.a; + float opacity = 1; color = DEGAMMA(color); float3 P = PSIn.pos3D; float3 V = g_xCamera_CamPos - P; diff --git a/WickedEngine/wiLoader.h b/WickedEngine/wiLoader.h index c1fbbd182..d679dbe4d 100644 --- a/WickedEngine/wiLoader.h +++ b/WickedEngine/wiLoader.h @@ -993,6 +993,10 @@ static const int RESOLUTION = 36; struct EnvironmentProbe : public Transform { wiRenderTarget cubeMap; + bool realTime; + bool isUpToDate; + + EnvironmentProbe() :realTime(false), isUpToDate(false) {} }; struct Model : public Transform