From e149024b8f347acc45c75535aca0e19519881078 Mon Sep 17 00:00:00 2001 From: Areloch Date: Mon, 15 May 2017 00:45:43 -0500 Subject: [PATCH] Merge pull request #2002 from OTHGMars/VolFogLeak VolumetricFog memory leak fix --- Engine/source/environment/VolumetricFog.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Engine/source/environment/VolumetricFog.cpp b/Engine/source/environment/VolumetricFog.cpp index c4f895fe9..49b79a30a 100644 --- a/Engine/source/environment/VolumetricFog.cpp +++ b/Engine/source/environment/VolumetricFog.cpp @@ -142,7 +142,7 @@ VolumetricFog::VolumetricFog() VolumetricFog::~VolumetricFog() { - if (isClientObject()) + if (!isClientObject()) return; for (S32 i = 0; i < det_size.size(); i++) @@ -152,12 +152,11 @@ VolumetricFog::~VolumetricFog() if (det_size[i].piArray != NULL) delete(det_size[i].piArray); if (det_size[i].verts != NULL) - delete(det_size[i].verts); + delete [] (det_size[i].verts); } det_size.clear(); - if (z_buf.isValid()) - SAFE_DELETE(z_buf); + z_buf = NULL; if (!mTexture.isNull()) mTexture.free(); @@ -365,7 +364,7 @@ bool VolumetricFog::LoadShape() if (det_size[i].piArray != NULL) delete(det_size[i].piArray); if (det_size[i].verts != NULL) - delete(det_size[i].verts); + delete [] (det_size[i].verts); } det_size.clear();