[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41202] branches/soc-2011-carrot/source/ blender/render/intern/source/render_texture.c: Dynamic Paint:

[Miika Hamalainen]

Revision: 41202
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41202
Author:   miikah
Date:     2011-10-22 17:15:32 +0000 (Sat, 22 Oct 2011)
Log Message:
-----------
Dynamic Paint:
* Fixed a memory leak from previous commit.

Modified Paths:
--------------
    
branches/soc-2011-carrot/source/blender/render/intern/source/render_texture.c

Modified: 
branches/soc-2011-carrot/source/blender/render/intern/source/render_texture.c
===================================================================
--- 
branches/soc-2011-carrot/source/blender/render/intern/source/render_texture.c   
    2011-10-22 17:01:54 UTC (rev 41201)
+++ 
branches/soc-2011-carrot/source/blender/render/intern/source/render_texture.c   
    2011-10-22 17:15:32 UTC (rev 41202)
@@ -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 @@
                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);
 }
 
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs