Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiika Hamalainen <blender@miikah.org>2011-10-22 21:15:32 +0400
committerMiika Hamalainen <blender@miikah.org>2011-10-22 21:15:32 +0400
commite441c71f770446c942362a3c75b453159b15c0d1 (patch)
tree9cb3ca678c5bec914afa7e455d118996b0f4cc84 /source/blender/render
parentd4541fd891a246f851f647c3259fc26648fc926d (diff)
Dynamic Paint:
* Fixed a memory leak from previous commit.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/render_texture.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c
index a050fd8622b..51a1a93ac1f 100644
--- a/source/blender/render/intern/source/render_texture.c
+++ b/source/blender/render/intern/source/render_texture.c
@@ -71,6 +71,8 @@
#include "BKE_key.h"
#include "BKE_ipo.h"
+#include "MEM_guardedalloc.h"
+
#include "envmap.h"
#include "pointdensity.h"
#include "voxeldata.h"
@@ -3606,10 +3608,13 @@ void RE_free_sample_material(Material *mat)
if(mat->mtex[tex_nr]) {
MTex *mtex= mat->mtex[tex_nr];
free_texture(mtex->tex);
+ MEM_freeN(mtex->tex);
+ mtex->tex = NULL;
}
}
free_material(mat);
+ MEM_freeN(mat);
}