diff options
author | Antonioya <blendergit@gmail.com> | 2018-08-07 23:22:03 +0300 |
---|---|---|
committer | Antonioya <blendergit@gmail.com> | 2018-08-07 23:22:03 +0300 |
commit | d2f709b1792ba017ba29b7228a706a7bb05622a1 (patch) | |
tree | 1fb06f45330a182eb7b8b9dd470c2ae86fd7a392 /source | |
parent | 3884b86927747a2662d0852d6d57c043c37d8cb4 (diff) |
Fix memory leak in previous commit
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c | 3 | ||||
-rw-r--r-- | source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c | 4 |
2 files changed, 1 insertions, 6 deletions
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" @@ -50,6 +48,7 @@ #include "BKE_main.h" #include "DEG_depsgraph.h" +#include "DEG_depsgraph.h" #include "MOD_gpencil_util.h" #include "MOD_gpencil_modifiertypes.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); |