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

SL-9685 

Make sure legacy opaque water texture ID is assigned so it can be bound for lowest graphics use.
meow-7.2.2
Graham Linden 2018-09-18 20:31:26 +01:00
parent 08dd04aa98
commit 862b8f72dc
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/lldrawpoolwater.cpp
View File

@ -76,10 +76,10 @@ void LLDrawPoolWater::setTransparentTextures(const LLUUID& transparentTextureId,
mWaterImagep[1]->addTextureStats(1024.f*1024.f);
}
void LLDrawPoolWater::setOpaqueTexture()
void LLDrawPoolWater::setOpaqueTexture(const LLUUID& opaqueTextureId)
{
LLSettingsWater::ptr_t pwater = LLEnvironment::instance().getCurrentWater();
mOpaqueWaterImagep = LLViewerTextureManager::getFetchedTexture(pwater->GetDefaultOpaqueTextureAssetId());
mOpaqueWaterImagep = LLViewerTextureManager::getFetchedTexture(opaqueTextureId);
mOpaqueWaterImagep->addTextureStats(1024.f*1024.f);
}

2
indra/newview/lldrawpoolwater.h
View File

@ -83,7 +83,7 @@ public:
void shade();
void setTransparentTextures(const LLUUID& transparentTextureId, const LLUUID& nextTransparentTextureId);
void setOpaqueTexture();
void setOpaqueTexture(const LLUUID& opaqueTextureId);
void setNormalMaps(const LLUUID& normalMapId, const LLUUID& nextNormalMapId);
protected:

1
indra/newview/llsettingsvo.cpp
View File

@ -851,6 +851,7 @@ void LLSettingsVOWater::updateSettings()
if (pwaterpool)
{
pwaterpool->setTransparentTextures(getTransparentTextureID(), getNextTransparentTextureID());
pwaterpool->setOpaqueTexture(GetDefaultOpaqueTextureAssetId());
pwaterpool->setNormalMaps(getNormalMapID(), getNextNormalMapID());
}
}