diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-05-30 01:26:27 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-05-30 01:26:27 -0500 |
| commit | 89473b2dc3ecfa8b813268833edddb5b0abd317d (patch) | |
| tree | 0252d59b1ee470ab36b0446da5c4d2e3827fbe1f /indra/llrender/llvertexbuffer.cpp | |
| parent | 8c5fde7ae499a20c5cf2b51f575059dd01693ae8 (diff) | |
| parent | eca17c8993aecfd8d69c1b1765f8ac841ad29119 (diff) | |
merge
Diffstat (limited to 'indra/llrender/llvertexbuffer.cpp')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 8c9171ccf4..f715a8e9ba 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -1497,7 +1497,14 @@ void LLVertexBuffer::setupVertexBuffer(U32 data_mask) const } if (data_mask & MAP_VERTEX) { - glVertexPointer(3,GL_FLOAT, LLVertexBuffer::sTypeSize[TYPE_VERTEX], (void*)(base + 0)); + if (data_mask & MAP_TEXTURE_INDEX) + { + glVertexPointer(4,GL_FLOAT, LLVertexBuffer::sTypeSize[TYPE_VERTEX], (void*)(base + 0)); + } + else + { + glVertexPointer(3,GL_FLOAT, LLVertexBuffer::sTypeSize[TYPE_VERTEX], (void*)(base + 0)); + } } llglassertok(); |