diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-08-23 09:19:59 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-08-23 09:19:59 -0400 |
| commit | bcf5dc079a5dc9434b541a971e28315fa5cb9816 (patch) | |
| tree | 16f6b186d704ca9682bcbfcb8aca1e29ef85b103 /indra/llrender/llvertexbuffer.cpp | |
| parent | fa53653e60f5761c157b76423b4449fe38788d8f (diff) | |
| parent | 08cbed55ef5689fcc5a02dfb3b9afde15487036e (diff) | |
merge changes for 5.0.7-release
Diffstat (limited to 'indra/llrender/llvertexbuffer.cpp')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 31dffdd545..607bbf3b3b 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -1234,7 +1234,7 @@ void LLVertexBuffer::createGLIndices(U32 size) void LLVertexBuffer::destroyGLBuffer() { - if (mGLBuffer) + if (mGLBuffer || mMappedData) { if (mMappedDataUsingVBOs) { @@ -1254,7 +1254,7 @@ void LLVertexBuffer::destroyGLBuffer() void LLVertexBuffer::destroyGLIndices() { - if (mGLIndices) + if (mGLIndices || mMappedIndexData) { if (mMappedIndexDataUsingVBOs) { |