[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54316] trunk/blender/source/blender: remove stringify macro from alloc's

[Campbell Barton]

Revision: 54316
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54316
Author:   campbellbarton
Date:     2013-02-05 09:42:40 +0000 (Tue, 05 Feb 2013)
Log Message:
-----------
remove stringify macro from alloc's

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
    trunk/blender/source/blender/blenkernel/intern/node.c
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_mask.c
    trunk/blender/source/blender/render/intern/source/bake.c

Modified: trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c	2013-02-05 08:16:04 UTC (rev 54315)
+++ trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c	2013-02-05 09:42:40 UTC (rev 54316)
@@ -213,7 +213,7 @@
 {
 	MaskRasterHandle *mr_handle;
 
-	mr_handle = MEM_callocN(sizeof(MaskRasterHandle), STRINGIFY(MaskRasterHandle));
+	mr_handle = MEM_callocN(sizeof(MaskRasterHandle), "MaskRasterHandle");
 
 	return mr_handle;
 }
@@ -569,7 +569,7 @@
 	unsigned int masklay_index;
 
 	mr_handle->layers_tot = BLI_countlist(&mask->masklayers);
-	mr_handle->layers = MEM_mallocN(sizeof(MaskRasterLayer) * mr_handle->layers_tot, STRINGIFY(MaskRasterLayer));
+	mr_handle->layers = MEM_mallocN(sizeof(MaskRasterLayer) * mr_handle->layers_tot, "MaskRasterLayer");
 	BLI_rctf_init_minmax(&mr_handle->bounds);
 
 	for (masklay = mask->masklayers.first, masklay_index = 0; masklay; masklay = masklay->next, masklay_index++) {

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c	2013-02-05 08:16:04 UTC (rev 54315)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2013-02-05 09:42:40 UTC (rev 54316)
@@ -1634,7 +1634,7 @@
 {
 #ifdef USE_NODE_CB_VALIDATE
 	/* add extra info */
-	bNodeClipboardExtraInfo *node_info = MEM_mallocN(sizeof(bNodeClipboardExtraInfo), STRINGIFY(bNodeClipboardExtraInfo));
+	bNodeClipboardExtraInfo *node_info = MEM_mallocN(sizeof(bNodeClipboardExtraInfo), "bNodeClipboardExtraInfo");
 
 	node_info->id = node->id;
 	if (node->id) {

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2013-02-05 08:16:04 UTC (rev 54315)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2013-02-05 09:42:40 UTC (rev 54316)
@@ -8979,7 +8979,7 @@
 	fd->tot_bheadmap = tot;
 	if (tot == 0) return;
 	
-	bhs = fd->bheadmap = MEM_mallocN(tot*sizeof(struct BHeadSort), STRINGIFY(BHeadSort));
+	bhs = fd->bheadmap = MEM_mallocN(tot * sizeof(struct BHeadSort), "BHeadSort");
 	
 	for (bhead = blo_firstbhead(fd); bhead; bhead = blo_nextbhead(fd, bhead), bhs++) {
 		bhs->bhead = bhead;

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_mask.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_mask.c	2013-02-05 08:16:04 UTC (rev 54315)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_mask.c	2013-02-05 09:42:40 UTC (rev 54316)
@@ -47,7 +47,7 @@
 
 static void node_composit_init_mask(bNodeTree *UNUSED(ntree), bNode *node, bNodeTemplate *UNUSED(ntemp))
 {
-	NodeMask *data = MEM_callocN(sizeof(NodeMask), STRINGIFY(NodeMask));
+	NodeMask *data = MEM_callocN(sizeof(NodeMask), "NodeMask");
 	data->size_x = data->size_y = 256;
 	node->storage = data;
 

Modified: trunk/blender/source/blender/render/intern/source/bake.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/bake.c	2013-02-05 08:16:04 UTC (rev 54315)
+++ trunk/blender/source/blender/render/intern/source/bake.c	2013-02-05 09:42:40 UTC (rev 54316)
@@ -818,7 +818,7 @@
 			BLI_lock_thread(LOCK_CUSTOM1);
 			userdata = bs->ibuf->userdata;
 			if (userdata == NULL) /* since the thread was locked, its possible another thread alloced the value */
-				userdata = MEM_callocN(sizeof(BakeImBufuserData), STRINGIFY(BakeImBufuserData));
+				userdata = MEM_callocN(sizeof(BakeImBufuserData), "BakeImBufuserData");
 
 			if (bs->use_mask) {
 				if (userdata->mask_buffer == NULL) {