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

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

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

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