Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 00:13:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping

Browse source
This commit is contained in:
David Back 2018-08-27 18:04:23 -07:00
commit 990638fd95
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp
View file

@ -765,7 +765,6 @@ void GLBackend::recycle() const {
} }
_textureManagement._transferEngine->manageMemory(); _textureManagement._transferEngine->manageMemory();
Texture::KtxStorage::releaseOpenKtxFiles();
} }
void GLBackend::setCameraCorrection(const Mat4& correction, const Mat4& prevRenderView, bool reset) { void GLBackend::setCameraCorrection(const Mat4& correction, const Mat4& prevRenderView, bool reset) {

1
libraries/gpu-gl-common/src/gpu/gl/GLTextureTransfer.cpp
View file

@ -405,6 +405,7 @@ bool GLTextureTransferEngineDefault::processActiveBufferQueue() {
_activeTransferQueue.splice(_activeTransferQueue.end(), activeBufferQueue); _activeTransferQueue.splice(_activeTransferQueue.end(), activeBufferQueue);
} }
Texture::KtxStorage::releaseOpenKtxFiles();
return true; return true;
} }