[Bf-blender-cvs] [d2f709b1792] blender2.8: Fix memory leak in previous commit

[Antonioya]

Commit: d2f709b1792ba017ba29b7228a706a7bb05622a1
Author: Antonioya
Date:   Tue Aug 7 22:22:03 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBd2f709b1792ba017ba29b7228a706a7bb05622a1

Fix memory leak in previous commit

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

M       source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
M       source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c

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

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c 
b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
index b47987ddbc0..b2df49a8d06 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
@@ -35,8 +35,6 @@
 #include "DNA_gpencil_types.h"
 #include "DNA_gpencil_modifier_types.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_blenlib.h"
 #include "BLI_ghash.h"
 #include "BLI_math_color.h"
@@ -130,7 +128,6 @@ static void bakeModifier(
                                        if (newmat == NULL) {
                                                
BKE_object_material_slot_add(bmain, ob);
                                                newmat = 
BKE_material_copy(bmain, mat);
-                                               newmat->gp_style = 
MEM_dupallocN(mat->gp_style);
                                                newmat->preview = NULL;
 
                                                assign_material(bmain, ob, 
newmat, ob->totcol, BKE_MAT_ASSIGN_USERPREF);
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c 
b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
index 8e2e97abf84..89d48492e46 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
@@ -35,8 +35,6 @@
 #include "DNA_gpencil_types.h"
 #include "DNA_gpencil_modifier_types.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_blenlib.h"
 #include "BLI_ghash.h"
 #include "BLI_math_vector.h"
@@ -49,6 +47,7 @@
 #include "BKE_material.h"
 #include "BKE_main.h"
 
+#include "DEG_depsgraph.h"
 #include "DEG_depsgraph.h"
 
 #include "MOD_gpencil_util.h"
@@ -138,7 +137,6 @@ static void bakeModifier(
                                        if (newmat == NULL) {
                                                
BKE_object_material_slot_add(bmain, ob);
                                                newmat = 
BKE_material_copy(bmain, mat);
-                                               newmat->gp_style = 
MEM_dupallocN(mat->gp_style);
                                                newmat->preview = NULL;
 
                                                assign_material(bmain, ob, 
newmat, ob->totcol, BKE_MAT_ASSIGN_USERPREF);

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