diff options
author | Campbell Barton <ideasman42@gmail.com> | 2008-02-29 02:14:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2008-02-29 02:14:55 +0300 |
commit | 5665d9333e8f1e047f838a4f64a2b3398fd76b28 (patch) | |
tree | 07b9470e346de53d7c3ebbe421fb76c6cf3e8d21 /source/blender/src/editnode.c | |
parent | 6169b29b3a53eca3e342aeee9d33809e61f026c3 (diff) |
* 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
Diffstat (limited to 'source/blender/src/editnode.c')
-rw-r--r-- | source/blender/src/editnode.c | 20 |
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; |