diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-02-07 14:51:30 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-02-07 14:51:30 -0600 |
| commit | 8c15a7e17fceeba9e55e254d7654c1a4f8c3b871 (patch) | |
| tree | 80deae74c1cb154fcf55433d635719a95509d89c /indra/newview/pipeline.cpp | |
| parent | 38e0b7de96de02243453eeaf5710b924f68abc7a (diff) | |
SH-2902 Fix for avatar bakes etc. getting garbage data sometimes.
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index dffc541001..c8a8b910ea 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1076,10 +1076,11 @@ void LLPipeline::createGLBuffers() if (LLPipeline::sWaterReflections) { //water reflection texture - U32 res = (U32) gSavedSettings.getS32("RenderWaterRefResolution"); + U32 res = (U32) llmax(gSavedSettings.getS32("RenderWaterRefResolution"), 512); mWaterRef.allocate(res,res,GL_RGBA,TRUE,FALSE); - mWaterDis.allocate(res,res,GL_RGBA,TRUE,FALSE); + //always use FBO for mWaterDis so it can be used for avatar texture bakes + mWaterDis.allocate(res,res,GL_RGBA,TRUE,FALSE,LLTexUnit::TT_TEXTURE, true); } mHighlight.allocate(256,256,GL_RGBA, FALSE, FALSE); |