[Bf-blender-cvs] [6d4ee22da27] greasepencil-object: WIP: Free modifiers memory

Antonio Vazquez noreply at git.blender.org
Wed Jun 20 17:42:18 CEST 2018


Commit: 6d4ee22da27256740a79a1e4c6e94b71e4021e32
Author: Antonio Vazquez
Date:   Wed Jun 20 17:42:03 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB6d4ee22da27256740a79a1e4c6e94b71e4021e32

WIP: Free modifiers memory

This was missing, but this lines get a segment fault

Still memory leak present

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

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

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

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index ed804e93932..ede23c6466e 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -87,6 +87,7 @@
 #include "BKE_displist.h"
 #include "BKE_effect.h"
 #include "BKE_fcurve.h"
+#include "BKE_gpencil_modifier.h"
 #include "BKE_icons.h"
 #include "BKE_key.h"
 #include "BKE_lamp.h"
@@ -190,11 +191,17 @@ void BKE_object_free_curve_cache(Object *ob)
 void BKE_object_free_modifiers(Object *ob, const int flag)
 {
 	ModifierData *md;
+	GpencilModifierData *gp_md;
 
 	while ((md = BLI_pophead(&ob->modifiers))) {
 		modifier_free_ex(md, flag);
 	}
-
+#if 0	/* FIXME */
+	/* grease pencil */
+	while ((gp_md = BLI_pophead(&ob->greasepencil_modifiers))) {
+		BKE_gpencil_modifier_free_ex(gp_md, flag);
+	}
+#endif
 	/* particle modifiers were freed, so free the particlesystems as well */
 	BKE_object_free_particlesystems(ob);



More information about the Bf-blender-cvs mailing list