Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-13 21:27:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2191 from birarda/null-checks

Browse source 
more null pointer cleanup
This commit is contained in:
AndrewMeadows 2014-03-04 12:07:39 -08:00
commit ea0fe95baa
3 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/src/renderer/TextureCache.cpp
View file

@ -41,15 +41,12 @@ TextureCache::~TextureCache() {
glDeleteTextures(1, &id);
}
if (_primaryFramebufferObject) {
delete _primaryFramebufferObject;
glDeleteTextures(1, &_primaryDepthTextureID);
}
if (_secondaryFramebufferObject) {
delete _secondaryFramebufferObject;
}
if (_tertiaryFramebufferObject) {
delete _tertiaryFramebufferObject;
}
delete _primaryFramebufferObject;
delete _secondaryFramebufferObject;
delete _tertiaryFramebufferObject;
}
GLuint TextureCache::getPermutationNormalTextureID() {

5
libraries/shared/src/Node.cpp
View file

@ -62,10 +62,7 @@ Node::Node(const QUuid& uuid, char type, const HifiSockAddr& publicSocket, const
}
Node::~Node() {
if (_linkedData) {
delete _linkedData;
}
delete _linkedData;
delete _bytesReceivedMovingAverage;
}

5
svo-viewer/src/Render2.cpp
View file

@ -267,7 +267,10 @@ void SvoViewer::InitializeVoxelOpt2RenderSystem()
delete [] _readVertexStructs;
//delete [] _readIndicesArray;
delete [] faceCenters;
for (int k = 0; k < NUM_CUBE_FACES; k++) if (_segmentIdxBuffers[i].idxBuff[k]) delete [] _segmentIdxBuffers[i].idxBuff[k];
for (int k = 0; k < NUM_CUBE_FACES; k++) {
delete[] _segmentIdxBuffers[i].idxBuff[k];
}
}
_voxelOptRenderInitialized = true;