livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in graham_linden/viewer-eep-graham (pull request #84) 

SL-1872
meow-7.2.2
Rider Linden 2018-09-14 15:43:52 +00:00
parent 53de3916a1 46d194d352
commit 62005a3b52
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/app_settings/shaders/class1/interface/customalphaF.glsl
View File

@ -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;
}

2
indra/newview/llpaneleditwater.cpp
View File

@ -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(); });