kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

make node select_all consistent with other select operators, also add Ctrl+I, select inverse to node space.

Browse Source
This commit is contained in:
Campbell Barton 2012-08-01 13:28:19 +00:00
parent 507a49add5
commit 179d00fb9c
8 changed files with 52 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
release/scripts/startup/bl_ui/space_node.py
View File

@ -135,7 +135,8 @@ class NODE_MT_select(Menu):
layout.operator("node.select_border")
layout.separator()
layout.operator("node.select_all")
layout.operator("node.select_all").action = 'TOGGLE'
layout.operator("node.select_all", text="Inverse").action = 'INVERT'
layout.operator("node.select_linked_from")
layout.operator("node.select_linked_to")
layout.operator("node.select_same_type")

11
source/blender/editors/include/ED_node.h
View File

@ -51,9 +51,9 @@ typedef enum {
} NodeBorder;
/* drawnode.c */
void ED_init_node_butfuncs(void);
void drawnodesnap(struct View2D *v2d, const float cent[2], float size, NodeBorder border);
void ED_node_init_butfuncs(void);
void ED_node_sample_set(const float col[4]);
void ED_node_draw_snap(struct View2D *v2d, const float cent[2], float size, NodeBorder border);
/* node_draw.c */
void ED_node_tree_update(struct SpaceNode *snode, struct Scene *scene);
@ -67,13 +67,10 @@ void ED_node_composit_default(struct Scene *sce);
void ED_node_texture_default(struct Tex *tex);
void ED_node_link_intersect_test(struct ScrArea *sa, int test);
void ED_node_link_insert(struct ScrArea *sa);
int ED_node_select_check(ListBase *lb);
void ED_node_post_apply_transform(struct bContext *C, struct bNodeTree *ntree);
void ED_node_set_active(struct Main *bmain, struct bNodeTree *ntree, struct bNode *node);
void ED_node_sample_set(const float col[4]);
/* node ops.c */
void ED_operatormacros_node(void);

4
source/blender/editors/space_node/drawnode.c
View File

@ -2950,7 +2950,7 @@ static void node_texture_set_butfunc(bNodeType *ntype)
/* ******* init draw callbacks for all tree types, only called in usiblender.c, once ************* */
void ED_init_node_butfuncs(void)
void ED_node_init_butfuncs(void)
{
bNodeTreeType *treetype;
bNodeType *ntype;
@ -3498,7 +3498,7 @@ void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link)
// node_draw_link_straight(v2d, snode, link, th_col1, do_shaded, th_col2, do_triple, th_col3);
}
void drawnodesnap(View2D *v2d, const float cent[2], float size, NodeBorder border)
void ED_node_draw_snap(View2D *v2d, const float cent[2], float size, NodeBorder border)
{
glBegin(GL_LINES);

12
source/blender/editors/space_node/node_edit.c
View File

@ -3505,6 +3505,18 @@ void ED_node_link_intersect_test(ScrArea *sa, int test)
selink->flag |= NODE_LINKFLAG_HILITE;
}
int ED_node_select_check(ListBase *lb)
{
bNode *node;
for (node = lb->first; node; node = node->next) {
if (node->flag & NODE_SELECT) {
return TRUE;
}
}
return FALSE;
}
/* ******************************** */
// XXX some code needing updating to operators...

6
source/blender/editors/space_node/node_ops.c
View File

@ -261,7 +261,11 @@ void node_keymap(struct wmKeyConfig *keyconf)
WM_keymap_add_item(keymap, "NODE_OT_delete", DELKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "NODE_OT_delete_reconnect", XKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "NODE_OT_select_all", AKEY, KM_PRESS, 0, 0);
kmi = WM_keymap_add_item(keymap, "NODE_OT_select_all", AKEY, KM_PRESS, 0, 0);
RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
kmi = WM_keymap_add_item(keymap, "NODE_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0);
RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
WM_keymap_add_item(keymap, "NODE_OT_select_linked_to", LKEY, KM_PRESS, KM_SHIFT, 0);
WM_keymap_add_item(keymap, "NODE_OT_select_linked_from", LKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "NODE_OT_select_same_type", GKEY, KM_PRESS, KM_SHIFT, 0);

38
source/blender/editors/space_node/node_select.c
View File

@ -537,26 +537,34 @@ void NODE_OT_select_border(wmOperatorType *ot)
/* ****** Select/Deselect All ****** */
static int node_select_all_exec(bContext *C, wmOperator *UNUSED(op))
static int node_select_all_exec(bContext *C, wmOperator *op)
{
SpaceNode *snode = CTX_wm_space_node(C);
bNode *first = snode->edittree->nodes.first;
ListBase *node_lb = &snode->edittree->nodes;
bNode *node;
int count= 0;
int action = RNA_enum_get(op->ptr, "action");
for (node=first; node; node=node->next)
if (node->flag & NODE_SELECT)
count++;
if (action == SEL_TOGGLE) {
if (ED_node_select_check(node_lb))
action = SEL_DESELECT;
else
action = SEL_SELECT;
}
if (count) {
for (node=first; node; node=node->next)
node_deselect(node);
for (node = node_lb->first; node; node = node->next) {
switch (action) {
case SEL_SELECT:
node_select(node);
break;
case SEL_DESELECT:
node_deselect(node);
break;
case SEL_INVERT:
((node->flag & SELECT) ? node_deselect : node_select)(node);
break;
}
}
else {
for (node=first; node; node=node->next)
node_select(node);
}
ED_node_sort(snode->edittree);
WM_event_add_notifier(C, NC_NODE|NA_SELECTED, NULL);
@ -576,6 +584,8 @@ void NODE_OT_select_all(wmOperatorType *ot)
/* flags */
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
WM_operator_properties_select_all(ot);
}
/* ****** Select Linked To ****** */

4
source/blender/editors/transform/transform_snap.c
View File

@ -246,13 +246,13 @@ void drawSnapping(const struct bContext *C, TransInfo *t)
glColor4ubv(col);
}
drawnodesnap(&ar->v2d, p->co, size, 0);
ED_node_draw_snap(&ar->v2d, p->co, size, 0);
}
if (t->tsnap.status & POINT_INIT) {
glColor4ubv(activeCol);
drawnodesnap(&ar->v2d, t->tsnap.snapPoint, size, t->tsnap.snapNodeBorder);
ED_node_draw_snap(&ar->v2d, t->tsnap.snapPoint, size, t->tsnap.snapNodeBorder);
}
glDisable(GL_BLEND);

2
source/blender/windowmanager/intern/wm_init_exit.c
View File

@ -142,7 +142,7 @@ void WM_init(bContext *C, int argc, const char **argv)
ED_spacetypes_init(); /* editors/space_api/spacetype.c */
ED_file_init(); /* for fsmenu */
ED_init_node_butfuncs();
ED_node_init_butfuncs();
BLF_init(11, U.dpi); /* Please update source/gamengine/GamePlayer/GPG_ghost.cpp if you change this */
BLF_lang_init();