Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-04 12:50:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove if checks in cases where delete handles null

Browse source
This commit is contained in:
Stephen Birarda 2014-03-04 10:05:43 -08:00
parent 12996454f9
commit f5aaad1f33
3 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,16 +41,13 @@ TextureCache::~TextureCache() {
glDeleteTextures(1, &id); glDeleteTextures(1, &id);
} }
if (_primaryFramebufferObject) { if (_primaryFramebufferObject) {
delete _primaryFramebufferObject;
glDeleteTextures(1, &_primaryDepthTextureID); glDeleteTextures(1, &_primaryDepthTextureID);
} }
if (_secondaryFramebufferObject) {
delete _primaryFramebufferObject;
delete _secondaryFramebufferObject; delete _secondaryFramebufferObject;
}
if (_tertiaryFramebufferObject) {
delete _tertiaryFramebufferObject; delete _tertiaryFramebufferObject;
} }
}
GLuint TextureCache::getPermutationNormalTextureID() { GLuint TextureCache::getPermutationNormalTextureID() {
if (_permutationNormalTextureID == 0) { if (_permutationNormalTextureID == 0) {

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

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

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

@ -267,7 +267,10 @@ void SvoViewer::InitializeVoxelOpt2RenderSystem()
delete [] _readVertexStructs; delete [] _readVertexStructs;
//delete [] _readIndicesArray; //delete [] _readIndicesArray;
delete [] faceCenters; 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; _voxelOptRenderInitialized = true;