Warning fixes, one actual bug found in sequencer sound wave drawing. Also

changed some malloc to MEM_mallocN while trying to track down a memory leak.

2 files changed, 2 insertions, 43 deletions

diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_output.c b/source/blender/nodes/intern/TEX_nodes/TEX_output.c
index ab8920e67ad..62b2c3ed757 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_output.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_output.c
@@ -144,7 +144,7 @@ static void unique_name(bNode *node)
 					new_len = 31;
 			}
 			
-			new_name = malloc(new_len + 1);
+			new_name = MEM_mallocN(new_len + 1, "new_name");
 			strcpy(new_name, name);
 			name = new_name;
 		}
@@ -153,7 +153,7 @@ static void unique_name(bNode *node)
 	
 	if(new_name) {
 		strcpy(tno->name, new_name);
-		free(new_name);
+		MEM_freeN(new_name);
 	}
 }
 
diff --git a/source/blender/nodes/intern/TEX_util.c b/source/blender/nodes/intern/TEX_util.c
index 8b247688e8c..97426b7d782 100644
--- a/source/blender/nodes/intern/TEX_util.c
+++ b/source/blender/nodes/intern/TEX_util.c
@@ -189,44 +189,3 @@ void ntreeTexExecTree(
 	ntreeExecTree(nodes, &data, thread);
 }
 
-char* ntreeTexOutputMenu(bNodeTree *ntree)
-{
-	bNode *node;
-	int len = 1;
-	char *str;
-	char ctrl[4];
-	int index = 0;
-	
-	for(node= ntree->nodes.first; node; node= node->next)
-		if(node->type == TEX_NODE_OUTPUT) {
-			len += strlen( 
-				((TexNodeOutput*)node->storage)->name
-			) + strlen(" %xNNN|");
-			index ++;
-			
-			if(node->custom1 > 999) {
-				printf("Error: too many outputs");
-				break;
-			}
-		}
-			
-	str = malloc(len * sizeof(char));
-	*str = 0;
-
-	for(node= ntree->nodes.first; node; node= node->next)
-		if(node->type == TEX_NODE_OUTPUT) {
-			strcat(str, ((TexNodeOutput*)node->storage)->name);
-			strcat(str, " %x");
-			
-			sprintf(ctrl, "%d", node->custom1);
-			strcat(str, ctrl);
-			
-			if(--index)
-				strcat(str, "|");
-			else
-				break;
-		}
-	
-	return str;
-}
-