* Fix for own big, Adding group objects from the outliner didnt check they were externally linked.

* ping "~" in the fileselectors dir will take you to $HOME (non win32)
* Added a file selector for Node output image

1 files changed, 20 insertions, 0 deletions

diff --git a/source/blender/src/editnode.c b/source/blender/src/editnode.c
index 96b82899b1b..8a5385cd961 100644
--- a/source/blender/src/editnode.c
+++ b/source/blender/src/editnode.c
@@ -212,6 +212,13 @@ static void load_node_image(char *str)	/* called from fileselect */
 	}
 }
 
+static void set_node_imagepath(char *str)	/* called from fileselect */
+{
+	SpaceNode *snode= curarea->spacedata.first;
+	bNode *node= nodeGetActive(snode->edittree);
+	BLI_strncpy(((NodeImageFile *)node->storage)->name, str, sizeof( ((NodeImageFile *)node->storage)->name ));
+}
+
 static bNode *snode_get_editgroup(SpaceNode *snode)
 {
 	bNode *gnode;
@@ -288,6 +295,19 @@ static void composit_node_event(SpaceNode *snode, short event)
 			}
 			break;
 		}
+		case B_NODE_SETIMAGE:
+		{
+			bNode *node= nodeGetActive(snode->edittree);
+			char name[FILE_MAXDIR+FILE_MAXFILE];
+			
+			strcpy(name, ((NodeImageFile *)node->storage)->name);
+			if (G.qual & LR_CTRLKEY) {
+				activate_imageselect(FILE_SPECIAL, "SELECT OUTPUT DIR", name, set_node_imagepath);
+			} else {
+				activate_fileselect(FILE_SPECIAL, "SELECT OUTPUT DIR", name, set_node_imagepath);
+			}
+			break;
+		}
 		case B_NODE_TREE_EXEC:
 			snode_handle_recalc(snode);
 			break;