[Bf-blender-cvs] [76c3335c9d0] greasepencil-object: Cleanup: use __func__ for mallocN identifier

Campbell Barton noreply at git.blender.org
Mon Jul 30 10:47:26 CEST 2018


Commit: 76c3335c9d07a84d9ff3a88104c099b49de7ea09
Author: Campbell Barton
Date:   Mon Jul 30 18:47:16 2018 +1000
Branches: greasepencil-object
https://developer.blender.org/rB76c3335c9d07a84d9ff3a88104c099b49de7ea09

Cleanup: use __func__ for mallocN identifier

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

M	source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c

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

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
index 918a742dfeb..6b959659a60 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c
@@ -117,8 +117,8 @@ static void gpf_clear_all_strokes(bGPDframe *gpf)
  */
 static void reduce_stroke_points(bGPDstroke *gps, const int num_points, const eBuildGpencil_Transition transition)
 {
-	bGPDspoint *new_points = MEM_callocN(sizeof(bGPDspoint) * num_points, "GP Build Modifier - Reduced Points");
-	MDeformVert *new_dvert = MEM_callocN(sizeof(MDeformVert) * num_points, "GP Build Modifier - Reduced Weights");
+	bGPDspoint *new_points = MEM_callocN(sizeof(bGPDspoint) * num_points, __func__);
+	MDeformVert *new_dvert = MEM_callocN(sizeof(MDeformVert) * num_points, __func__);
 
 	/* Which end should points be removed from */
 	// TODO: free stroke weights
@@ -201,7 +201,7 @@ static void build_sequential(BuildGpencilModifierData *mmd, bGPDframe *gpf, floa
 
 	/* 1) Compute proportion of time each stroke should occupy */
 	/* NOTE: This assumes that the total number of points won't overflow! */
-	tStrokeBuildDetails *table = MEM_callocN(sizeof(tStrokeBuildDetails) * tot_strokes, "tStrokeBuildDetails");
+	tStrokeBuildDetails *table = MEM_callocN(sizeof(tStrokeBuildDetails) * tot_strokes, __func__);
 	size_t totpoints = 0;
 
 	/* 1.1) First pass - Tally up points */
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
index 82087d34c91..64f3fbc4a95 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
@@ -108,7 +108,7 @@ static void generate_geometry(
 	const int num_strokes = BLI_listbase_count(&gpf->strokes);
 	int num_valid = 0;
 
-	bool *valid_strokes = MEM_callocN(sizeof(bool) * num_strokes, "GP ArrayMod valid_strokes");
+	bool *valid_strokes = MEM_callocN(sizeof(bool) * num_strokes, __func__);
 
 	for (gps = gpf->strokes.first, idx = 0; gps; gps = gps->next, idx++) {
 		/* Record whether this stroke can be used



More information about the Bf-blender-cvs mailing list