diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-14 15:43:52 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-14 15:43:52 +0000 |
| commit | 62005a3b52ffbc79c78a99fc4a1e2f7911943bfd (patch) | |
| tree | 16ab63f051f155ea3ea4b588dfea2cc81c549f33 | |
| parent | 53de3916a16e316543cd12491556999a4c84f545 (diff) | |
| parent | 46d194d352a7da88e7a9c96fba404c61a1bddb89 (diff) | |
Merged in graham_linden/viewer-eep-graham (pull request #84)
SL-1872
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/customalphaF.glsl | 6 | ||||
| -rw-r--r-- | indra/newview/llpaneleditwater.cpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/customalphaF.glsl b/indra/newview/app_settings/shaders/class1/interface/customalphaF.glsl index a96d04cc39..f6b31a5956 100644 --- a/indra/newview/app_settings/shaders/class1/interface/customalphaF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/customalphaF.glsl @@ -38,7 +38,9 @@ VARYING vec2 vary_texcoord0; void main() { - vec4 color = vertex_color*texture2D(diffuseMap, vary_texcoord0.xy); - color.a *= custom_alpha; + vec4 color = texture2D(diffuseMap, vary_texcoord0.xy); + color.rgb = pow(color.rgb, vec3(0.45)); + color.rgb *= vertex_color.rgb; + color.a *= max(custom_alpha, vertex_color.a); frag_color = color; } diff --git a/indra/newview/llpaneleditwater.cpp b/indra/newview/llpaneleditwater.cpp index bf00ee34f9..5d7c6f3943 100644 --- a/indra/newview/llpaneleditwater.cpp +++ b/indra/newview/llpaneleditwater.cpp @@ -32,6 +32,7 @@ #include "lltexturectrl.h" #include "llcolorswatch.h" #include "llxyvector.h" +#include "llviewercontrol.h" namespace { @@ -88,6 +89,7 @@ BOOL LLPanelSettingsWaterMainTab::postBuild() getChild<LLUICtrl>(FIELD_WATER_UNDERWATER_MOD)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onFogUnderWaterChanged(); }); mTxtNormalMap->setDefaultImageAssetID(LLSettingsWater::GetDefaultWaterNormalAssetId()); + mTxtNormalMap->setBlankImageAssetID(LLUUID( gSavedSettings.getString( "DefaultBlankNormalTexture" ))); mTxtNormalMap->setCommitCallback([this](LLUICtrl *, const LLSD &) { onNormalMapChanged(); }); getChild<LLUICtrl>(FIELD_WATER_WAVE2_XY)->setCommitCallback([this](LLUICtrl *, const LLSD &) { onSmallWaveChanged(); }); |