[Bf-blender-cvs] [d97c6c36b8] clay-engine: Fix mem freed twice

[Dalai Felinto]

Commit: d97c6c36b83f6417e29734f0abcbd84bf351ffb6
Author: Dalai Felinto
Date:   Wed Jan 11 16:20:10 2017 +0100
Branches: clay-engine
https://developer.blender.org/rBd97c6c36b83f6417e29734f0abcbd84bf351ffb6

Fix mem freed twice

===================================================================

M       source/blender/draw/intern/draw_manager.c

===================================================================

diff --git a/source/blender/draw/intern/draw_manager.c 
b/source/blender/draw/intern/draw_manager.c
index 902916c6b5..0709d490d0 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -335,9 +335,6 @@ DRWBatch *DRW_batch_create(struct GPUShader *shader, 
DRWPass *pass)
 
 void DRW_batch_free(struct DRWBatch *batch)
 {
-       for (LinkData *link = batch->objects.first; link; link = link->next) {
-               MEM_freeN(link->data);
-       }
        BLI_freelistN(&batch->objects);
 
        BLI_freelistN(&batch->interface->uniforms);
@@ -352,9 +349,6 @@ void DRW_batch_surface_add(DRWBatch *batch, Object *ob)
 
 void DRW_batch_surface_clear(DRWBatch *batch)
 {
-       for (LinkData *link = batch->objects.first; link; link = link->next) {
-               MEM_freeN(link->data);
-       }
        BLI_freelistN(&batch->objects);
        //BLI_listbase_clear(&batch->objects);
 }
@@ -419,7 +413,7 @@ void DRW_batch_uniform_mat4(DRWBatch *batch, const char 
*name, const float *valu
 
 DRWPass *DRW_pass_create(const char *name, DRWState state)
 {
-       DRWPass *pass = (DRWPass *)MEM_callocN(sizeof(DRWPass), name);
+       DRWPass *pass = MEM_callocN(sizeof(DRWPass), name);
        pass->state = state;
 
        return pass;

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