Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'smarter_textures' of https://github.com/highfidelity/hifi into texmex

Browse source
This commit is contained in:
sam 2017-02-17 18:05:27 -08:00
commit b6f778633e
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/gpu/src/gpu/Texture.cpp
View file

@ -127,7 +127,9 @@ Texture::Pixels::Pixels(const Element& format, Size size, const Byte* bytes) :
}
Texture::Pixels::~Pixels() {
Texture::updateTextureCPUMemoryUsage(_storage->size(), 0);
if (_storage) {
Texture::updateTextureCPUMemoryUsage(_storage->size(), 0);
}
}
void Texture::Storage::assignTexture(Texture* texture) {