[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49448] trunk/blender: make node select_all consistent with other select operators, also add Ctrl+I, select inverse to node space.
Campbell Barton
ideasman42 at gmail.com
Wed Aug 1 15:28:19 CEST 2012
Revision: 49448
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49448
Author: campbellbarton
Date: 2012-08-01 13:28:19 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
make node select_all consistent with other select operators, also add Ctrl+I, select inverse to node space.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/space_node.py
trunk/blender/source/blender/editors/include/ED_node.h
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_node/node_ops.c
trunk/blender/source/blender/editors/space_node/node_select.c
trunk/blender/source/blender/editors/transform/transform_snap.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
Modified: trunk/blender/release/scripts/startup/bl_ui/space_node.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_node.py 2012-08-01 13:17:26 UTC (rev 49447)
+++ trunk/blender/release/scripts/startup/bl_ui/space_node.py 2012-08-01 13:28:19 UTC (rev 49448)
@@ -135,7 +135,8 @@
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")
Modified: trunk/blender/source/blender/editors/include/ED_node.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_node.h 2012-08-01 13:17:26 UTC (rev 49447)
+++ trunk/blender/source/blender/editors/include/ED_node.h 2012-08-01 13:28:19 UTC (rev 49448)
@@ -51,10 +51,10 @@
} NodeBorder;
/* drawnode.c */
-void ED_init_node_butfuncs(void);
+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);
-void drawnodesnap(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);
void ED_node_changed_update(struct ID *id, struct bNode *node);
@@ -67,13 +67,10 @@
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);
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2012-08-01 13:17:26 UTC (rev 49447)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2012-08-01 13:28:19 UTC (rev 49448)
@@ -2950,7 +2950,7 @@
/* ******* 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 @@
// 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);
Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c 2012-08-01 13:17:26 UTC (rev 49447)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c 2012-08-01 13:28:19 UTC (rev 49448)
@@ -3505,7 +3505,19 @@
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...
Modified: trunk/blender/source/blender/editors/space_node/node_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_ops.c 2012-08-01 13:17:26 UTC (rev 49447)
+++ trunk/blender/source/blender/editors/space_node/node_ops.c 2012-08-01 13:28:19 UTC (rev 49448)
@@ -261,7 +261,11 @@
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);
Modified: trunk/blender/source/blender/editors/space_node/node_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_select.c 2012-08-01 13:17:26 UTC (rev 49447)
+++ trunk/blender/source/blender/editors/space_node/node_select.c 2012-08-01 13:28:19 UTC (rev 49448)
@@ -537,26 +537,34 @@
/* ****** 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 @@
/* flags */
ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;
+
+ WM_operator_properties_select_all(ot);
}
/* ****** Select Linked To ****** */
Modified: trunk/blender/source/blender/editors/transform/transform_snap.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_snap.c 2012-08-01 13:17:26 UTC (rev 49447)
+++ trunk/blender/source/blender/editors/transform/transform_snap.c 2012-08-01 13:28:19 UTC (rev 49448)
@@ -246,13 +246,13 @@
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);
Modified: trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c 2012-08-01 13:17:26 UTC (rev 49447)
+++ trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c 2012-08-01 13:28:19 UTC (rev 49448)
@@ -142,7 +142,7 @@
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();
More information about the Bf-blender-cvs
mailing list