Merge pull request #2002 from OTHGMars/VolFogLeak

VolumetricFog memory leak fix
This commit is contained in:
Areloch 2017-05-15 00:45:43 -05:00 committed by GitHub
commit f5347f95bf

View file

@ -142,7 +142,7 @@ VolumetricFog::VolumetricFog()
VolumetricFog::~VolumetricFog() VolumetricFog::~VolumetricFog()
{ {
if (isClientObject()) if (!isClientObject())
return; return;
for (S32 i = 0; i < det_size.size(); i++) for (S32 i = 0; i < det_size.size(); i++)
@ -152,12 +152,11 @@ VolumetricFog::~VolumetricFog()
if (det_size[i].piArray != NULL) if (det_size[i].piArray != NULL)
delete(det_size[i].piArray); delete(det_size[i].piArray);
if (det_size[i].verts != NULL) if (det_size[i].verts != NULL)
delete(det_size[i].verts); delete [] (det_size[i].verts);
} }
det_size.clear(); det_size.clear();
if (z_buf.isValid()) z_buf = NULL;
SAFE_DELETE(z_buf);
if (!mTexture.isNull()) if (!mTexture.isNull())
mTexture.free(); mTexture.free();
@ -365,7 +364,7 @@ bool VolumetricFog::LoadShape()
if (det_size[i].piArray != NULL) if (det_size[i].piArray != NULL)
delete(det_size[i].piArray); delete(det_size[i].piArray);
if (det_size[i].verts != NULL) if (det_size[i].verts != NULL)
delete(det_size[i].verts); delete [] (det_size[i].verts);
} }
det_size.clear(); det_size.clear();