[Bf-blender-cvs] [1260baf16b9] master: GPencil: Remove unused variable and fix memory leak
Antonio Vazquez
noreply at git.blender.org
Wed Aug 12 23:07:32 CEST 2020
Commit: 1260baf16b9fffe2147b8ec1a2c424b0e8bf8106
Author: Antonio Vazquez
Date: Wed Aug 12 23:07:01 2020 +0200
Branches: master
https://developer.blender.org/rB1260baf16b9fffe2147b8ec1a2c424b0e8bf8106
GPencil: Remove unused variable and fix memory leak
This was missing in previous commit
===================================================================
M source/blender/editors/gpencil/gpencil_merge.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_merge.c b/source/blender/editors/gpencil/gpencil_merge.c
index 4839c69b2e3..4aae0b97e05 100644
--- a/source/blender/editors/gpencil/gpencil_merge.c
+++ b/source/blender/editors/gpencil/gpencil_merge.c
@@ -584,8 +584,6 @@ static int gpencil_stroke_merge_material_exec(bContext *C, wmOperator *op)
const float val_threshold = RNA_float_get(op->ptr, "val_threshold");
/* Review materials. */
- GHash *mat_table = BLI_ghash_int_new(__func__);
-
short *totcol = BKE_object_material_len_p(ob);
if (totcol == 0) {
return OPERATOR_CANCELLED;
More information about the Bf-blender-cvs
mailing list