Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Weikert <elubie@gmx.net>2007-09-14 22:41:00 +0400
committerAndrea Weikert <elubie@gmx.net>2007-09-14 22:41:00 +0400
commit427e0637779aaa8f01294584cb4bf746e435240e (patch)
tree096acdb94bbfe8a1a4427e76d75a400f9d501743 /source/blender/src
parentee6acc1061e94378a0aa5fab4b73f72c849531ad (diff)
== imagebrowser ==
* activate imagebrowser for image node with CTRL+LMB on load button in image node.
Diffstat (limited to 'source/blender/src')
-rw-r--r--source/blender/src/editnode.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/src/editnode.c b/source/blender/src/editnode.c
index 0b8e0776d93..e5e83152ae2 100644
--- a/source/blender/src/editnode.c
+++ b/source/blender/src/editnode.c
@@ -60,6 +60,7 @@
#include "BIF_editview.h"
#include "BIF_gl.h"
#include "BIF_graphics.h"
+#include "BIF_imasel.h"
#include "BIF_interface.h"
#include "BIF_mywindow.h"
#include "BIF_previewrender.h"
@@ -279,8 +280,11 @@ static void composit_node_event(SpaceNode *snode, short event)
if(node->id)
strcpy(name, ((Image *)node->id)->name);
else strcpy(name, U.textudir);
-
- activate_fileselect(FILE_SPECIAL, "SELECT IMAGE", name, load_node_image);
+ if (G.qual & LR_CTRLKEY) {
+ activate_imageselect(FILE_SPECIAL, "SELECT IMAGE", name, load_node_image);
+ } else {
+ activate_fileselect(FILE_SPECIAL, "SELECT IMAGE", name, load_node_image);
+ }
break;
}
case B_NODE_TREE_EXEC: