diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-08 15:39:02 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-08 15:39:02 -0500 |
| commit | f076bdf609ec1fe114a7d0222a318483c97c7a26 (patch) | |
| tree | 93dbd2a949d60daaf6aaa025ca7cf036cf90a929 /indra/newview/llvosurfacepatch.cpp | |
| parent | f302e119627090c22325df59c40e1762402a08c6 (diff) | |
| parent | b9439ac006ac64179180ec2a47f6bd92468de455 (diff) | |
merge
Diffstat (limited to 'indra/newview/llvosurfacepatch.cpp')
| -rw-r--r-- | indra/newview/llvosurfacepatch.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llvosurfacepatch.cpp b/indra/newview/llvosurfacepatch.cpp index 510525259f..0b746c841c 100644 --- a/indra/newview/llvosurfacepatch.cpp +++ b/indra/newview/llvosurfacepatch.cpp @@ -59,6 +59,12 @@ public: // virtual void setupVertexBuffer(U32 data_mask) const { + if (LLGLSLShader::sNoFixedFunction) + { //just use default if shaders are in play + LLVertexBuffer::setupVertexBuffer(data_mask & ~(MAP_TEXCOORD2 | MAP_TEXCOORD3)); + return; + } + U8* base = useVBOs() ? (U8*) mAlignedOffset : mMappedData; //assume tex coords 2 and 3 are present |