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

This commit is contained in:
David Back 2018-06-29 15:16:37 -07:00
commit 70dfb26418

View file

@ -66,7 +66,7 @@ OffscreenSurface::OffscreenSurface()
}
OffscreenSurface::~OffscreenSurface() {
delete _sharedObject;
_sharedObject->deleteLater();
}
bool OffscreenSurface::fetchTexture(TextureAndFence& textureAndFence) {