avoid using MEM_reallocN_id directly, add utility macro for freeing.

2 files changed, 10 insertions, 9 deletions

diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c
index e0b4f94f0b7..f24edfea136 100644
--- a/source/blender/blenkernel/intern/fmodifier.c
+++ b/source/blender/blenkernel/intern/fmodifier.c
@@ -144,9 +144,8 @@ static void fcm_generator_verify(FModifier *fcm)
 			const int arraysize_new = data->poly_order + 1;
 			/* arraysize needs to be order+1, so resize if not */
 			if (data->arraysize != arraysize_new) {
-				data->coefficients = MEM_recallocN_id(data->coefficients,
-				                                      sizeof(float) * arraysize_new,
-				                                      "FMod_Generator_Coefs");
+				data->coefficients = MEM_recallocN(data->coefficients,
+				                                   sizeof(float) * arraysize_new);
 				data->arraysize = arraysize_new;
 			}
 			break;
@@ -156,9 +155,8 @@ static void fcm_generator_verify(FModifier *fcm)
 			const int arraysize_new = data->poly_order * 2;
 			/* arraysize needs to be (2 * order), so resize if not */
 			if (data->arraysize != arraysize_new) {
-				data->coefficients = MEM_recallocN_id(data->coefficients,
-				                                      sizeof(float) * arraysize_new,
-				                                      "FMod_Generator_Coefs");
+				data->coefficients = MEM_recallocN(data->coefficients,
+				                                   sizeof(float) * arraysize_new);
 				data->arraysize = arraysize_new;
 			}
 			break;
diff --git a/source/blender/blenlib/intern/buffer.c b/source/blender/blenlib/intern/buffer.c
index aac3a3bc3f3..36fb04a7bb7 100644
--- a/source/blender/blenlib/intern/buffer.c
+++ b/source/blender/blenlib/intern/buffer.c
@@ -34,9 +34,12 @@ static void *buffer_alloc(BLI_Buffer *buffer, int len)
 
 static void *buffer_realloc(BLI_Buffer *buffer, int len)
 {
-	return ((buffer->flag & BLI_BUFFER_USE_CALLOC) ?
-	        MEM_recallocN : MEM_reallocN)
-	        (buffer->data, (buffer->elem_size * len));
+	if (buffer->flag & BLI_BUFFER_USE_CALLOC) {
+		return MEM_recallocN(buffer->data, buffer->elem_size * len);
+	}
+	else {
+		return MEM_reallocN(buffer->data, buffer->elem_size * len);
+	}
 }
 
 void BLI_buffer_resize(BLI_Buffer *buffer, int new_count)