[Bf-blender-cvs] [18cf3e1a38] master: Fix unfreed memory after cleaning render layers

Dalai Felinto noreply at git.blender.org
Thu Jan 26 12:00:42 CET 2017


Commit: 18cf3e1a38a3cf50a182ef8ae764ccd3b37216aa
Author: Dalai Felinto
Date:   Thu Jan 26 11:58:47 2017 +0100
Branches: master
https://developer.blender.org/rB18cf3e1a38a3cf50a182ef8ae764ccd3b37216aa

Fix unfreed memory after cleaning render layers

The freestyle data was never freed when removing a renderlayer.

```
blender -b --factory-startup --debug-memory --python-expr "import bpy;bpy.ops.scene.render_layer_add();bpy.context.scene.render.layers.active_index=0;bpy.ops.scene.render_layer_remove()"
```

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

M	source/blender/blenkernel/intern/scene.c

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 69d3b4db54..56bfe5d7ff 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -2052,6 +2052,8 @@ bool BKE_scene_remove_render_layer(Main *bmain, Scene *scene, SceneRenderLayer *
 		return false;
 	}
 
+	BKE_freestyle_config_free(&srl->freestyleConfig);
+
 	BLI_remlink(&scene->r.layers, srl);
 	MEM_freeN(srl);




More information about the Bf-blender-cvs mailing list