Two tiny compositor annoyances;

- Image Node: after loading new file it didn't update the header name
- File-out Node: header color suggested there was only 1 'active', which
  it isn't.

2 files changed, 8 insertions, 1 deletions

diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index a9ac61327e4..e220a1f6197 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -1397,6 +1397,11 @@ void ntreeSolveOrder(bNodeTree *ntree)
 		if(node->typeinfo->nclass==NODE_CLASS_OUTPUT) {
 			bNode *tnode;
 			int output= 0;
+			
+			/* we need a check for which output node should be tagged like this, below an exception */
+			if(node->type==CMP_NODE_OUTPUT_FILE)
+			   continue;
+			   
 			/* there is more types having output class, each one is checked */
 			for(tnode= ntree->nodes.first; tnode; tnode= tnode->next) {
 				if(tnode->typeinfo->nclass==NODE_CLASS_OUTPUT) {
diff --git a/source/blender/src/editnode.c b/source/blender/src/editnode.c
index fefa58bea94..416de1e7b69 100644
--- a/source/blender/src/editnode.c
+++ b/source/blender/src/editnode.c
@@ -195,8 +195,10 @@ static void load_node_image(char *str)	/* called from fileselect */
 			node->id->us--;
 		
 		node->id= &ima->id;
-		ima->id.us++;
+		id_us_plus(node->id);
 
+		BLI_strncpy(node->name, node->id->name+2, 21);
+				   
 		free_image_buffers(ima);	/* force read again */
 		ima->ok= 1;