diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-11-22 16:44:36 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2017-11-22 16:44:36 +0200 |
| commit | 8c0388119318ee99084140845931eaa8a493339d (patch) | |
| tree | 5137c2a4f7ec058bc8ae8fb24f580666ecdb39f9 /indra | |
| parent | c1e55d37b6f96a46d1c187c90508979b500eddf4 (diff) | |
| parent | 5a402dbc1f90d3a6fa6a4581cdd7bcf8f0484b8e (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 8a4c21d6e4..2761a90566 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -1356,10 +1356,10 @@ bool LLVertexBuffer::allocateBuffer(S32 nverts, S32 nindices, bool create) sucsess &= updateNumVerts(nverts); sucsess &= updateNumIndices(nindices); - if (sucsess && create && (nverts || nindices)) + if (create && (nverts || nindices)) { //actually allocate space for the vertex buffer if using VBO mapping - flush(); + flush(); //unmap if (gGLManager.mHasVertexArrayObject && useVBOs() && sUseVAO) { @@ -1502,9 +1502,9 @@ bool LLVertexBuffer::resizeBuffer(S32 newnverts, S32 newnindices) sucsess &= updateNumVerts(newnverts); sucsess &= updateNumIndices(newnindices); - if (sucsess && useVBOs()) + if (useVBOs()) { - flush(); + flush(); //unmap if (mGLArray) { //if size changed, offsets changed |