From b7e87777a969f86d10e059ed04437f062e63127f Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sun, 7 Apr 2019 17:45:28 +0200 Subject: [PATCH] MariENB Skyrim 2.7.1 --- enbseries/VERSION | 2 +- enbseries/menbeffectfilters.fx | 2 +- enbseries/menbextrasettings.fx | 13 ++----------- enbseries/menbprepassfilters.fx | 2 +- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/enbseries/VERSION b/enbseries/VERSION index 360a68f..99dca1d 100644 --- a/enbseries/VERSION +++ b/enbseries/VERSION @@ -1 +1 @@ -2.7.0sk "Retro Retirement" +2.7.1sk "Retro Retirement" diff --git a/enbseries/menbeffectfilters.fx b/enbseries/menbeffectfilters.fx index ec98f9e..f1507bd 100644 --- a/enbseries/menbeffectfilters.fx +++ b/enbseries/menbeffectfilters.fx @@ -519,8 +519,8 @@ float4 PS_Mari( VS_OUTPUT_POST IN, float2 vPos : VPOS ) : COLOR if ( gradeenable2 ) res.rgb = GradingColorize(res.rgb); if ( gradeenable3 ) res.rgb = GradingHSV(res.rgb); } - if ( lutenable ) res.rgb = GradingLUT(res.rgb); if ( techenable ) res.rgb = Technicolor(res.rgb); + if ( lutenable ) res.rgb = GradingLUT(res.rgb); if ( !nbt && ne ) res.rgb = FilmGrain(res.rgb,coord); res.rgb = _r5.w*(_r5.rgb-res.rgb)+res.rgb; if ( dodither ) res.rgb = Dither(res.rgb,coord); diff --git a/enbseries/menbextrasettings.fx b/enbseries/menbextrasettings.fx index 021b631..09bb86e 100644 --- a/enbseries/menbextrasettings.fx +++ b/enbseries/menbextrasettings.fx @@ -4,17 +4,8 @@ Part of MariENB, the personal ENB of Marisa. Released under the GNU GPLv3 (or later). */ -/* - Paint filters: - -1 : Disabled - 0 : Oil painting filter, mixes Kuwahara with median for a smooth result - 1 : "Van Gogh" filter, ported from https://www.shadertoy.com/view/MdGSDG - with some small changes - 2 : "Watercolor" filter, ported from https://www.shadertoy.com/view/ltyGRV - also with some small changes - -*/ -string str_paint = "Painting Filters"; +/* Paint filter */ +string str_paint = "Painting Filter"; bool oilenable < string UIName = "Enable Oil Filter"; diff --git a/enbseries/menbprepassfilters.fx b/enbseries/menbprepassfilters.fx index 4211ee1..33b45ee 100644 --- a/enbseries/menbprepassfilters.fx +++ b/enbseries/menbprepassfilters.fx @@ -322,10 +322,10 @@ float4 PS_EdgeFilters( VS_OUTPUT_POST IN, float2 vPos : VPOS ) : COLOR { float2 coord = IN.txcoord.xy; float4 res = tex2D(SamplerColor,coord); - if ( fogenable ) res.rgb = Limbo(res.rgb,coord); if ( edgevenable ) res.rgb = EdgeView(res.rgb,coord); if ( comenable ) res.rgb = EdgeDetect(res.rgb,coord); if ( contenable ) res.rgb = LineView(res.rgb,coord); + if ( fogenable ) res.rgb = Limbo(res.rgb,coord); return res; } /* Distant hot air refraction. Not very realistic, but does the job. */