Merging r40265 through r40492 from trunk into soc-2011-tomato
[blender.git] / source / blender / blenkernel / intern / node.c
index d9969b6..bf8a8ab 100644 (file)
@@ -295,12 +295,12 @@ int nodeFindNode(bNodeTree *ntree, bNodeSocket *sock, bNode **nodep, int *sockin
 static void node_add_sockets_from_type(bNodeTree *ntree, bNode *node, bNodeType *ntype)
 {
        bNodeSocketTemplate *sockdef;
-       bNodeSocket *sock;
+       /* bNodeSocket *sock; */ /* UNUSED */
 
        if(ntype->inputs) {
                sockdef= ntype->inputs;
                while(sockdef->type != -1) {
-                       sock = node_add_input_from_template(ntree, node, sockdef);
+                       /* sock = */ node_add_input_from_template(ntree, node, sockdef);
                        
                        sockdef++;
                }
@@ -308,7 +308,7 @@ static void node_add_sockets_from_type(bNodeTree *ntree, bNode *node, bNodeType
        if(ntype->outputs) {
                sockdef= ntype->outputs;
                while(sockdef->type != -1) {
-                       sock = node_add_output_from_template(ntree, node, sockdef);
+                       /* sock = */ node_add_output_from_template(ntree, node, sockdef);
                        
                        sockdef++;
                }
@@ -620,7 +620,7 @@ bNodeTree *ntreeAddTree(const char *name, int type, int nodetype)
 bNodeTree *ntreeCopyTree(bNodeTree *ntree)
 {
        bNodeTree *newtree;
-       bNode *node, *nnode, *last;
+       bNode *node /*, *nnode */ /* UNUSED */, *last;
        bNodeLink *link;
        bNodeSocket *gsock, *oldgsock;
        
@@ -647,7 +647,7 @@ bNodeTree *ntreeCopyTree(bNodeTree *ntree)
        last = ntree->nodes.last;
        for(node= ntree->nodes.first; node; node= node->next) {
                node->new_node= NULL;
-               nnode= nodeCopyNode(newtree, node);     /* sets node->new */
+               /* nnode= */ nodeCopyNode(newtree, node);       /* sets node->new */
                
                /* make sure we don't copy new nodes again! */
                if (node==last)