Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(2760)

Unified Diff: source/blender/editors/space_node/node_ops.c

Issue 5593050: Node Group Interface Base URL: https://svn.blender.org/svnroot/bf-blender/trunk/blender/
Patch Set: Removed proxy node ntree storage, this causes problems with do_versions + lib_link Created 12 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/blender/editors/space_node/node_intern.h ('k') | source/blender/editors/space_node/node_select.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/blender/editors/space_node/node_ops.c
===================================================================
--- source/blender/editors/space_node/node_ops.c (revision 43995)
+++ source/blender/editors/space_node/node_ops.c (working copy)
@@ -59,6 +59,7 @@
WM_operatortype_append(NODE_OT_select_same_type);
WM_operatortype_append(NODE_OT_select_same_type_next);
WM_operatortype_append(NODE_OT_select_same_type_prev);
+ WM_operatortype_append(NODE_OT_select_proxy_item);
WM_operatortype_append(NODE_OT_view_all);
@@ -81,10 +82,6 @@
WM_operatortype_append(NODE_OT_group_make);
WM_operatortype_append(NODE_OT_group_ungroup);
WM_operatortype_append(NODE_OT_group_edit);
- WM_operatortype_append(NODE_OT_group_socket_add);
- WM_operatortype_append(NODE_OT_group_socket_remove);
- WM_operatortype_append(NODE_OT_group_socket_move_up);
- WM_operatortype_append(NODE_OT_group_socket_move_down);
WM_operatortype_append(NODE_OT_link_viewer);
@@ -99,6 +96,9 @@
WM_operatortype_append(NODE_OT_add_file);
WM_operatortype_append(NODE_OT_new_node_tree);
+
+ WM_operatortype_append(NODE_OT_move_input_item);
+ WM_operatortype_append(NODE_OT_move_output_item);
}
void ED_operatormacros_node(void)
@@ -142,6 +142,8 @@
/* mouse select in nodes used to be both keys, but perhaps this should be reduced?
* NOTE: mouse-clicks on left-mouse will fall through to allow transform-tweak, but also link/resize
*/
+ kmi = WM_keymap_add_item(keymap, "NODE_OT_select_proxy_item", ACTIONMOUSE, KM_PRESS, 0, 0);
+ kmi = WM_keymap_add_item(keymap, "NODE_OT_select_proxy_item", SELECTMOUSE, KM_PRESS, 0, 0);
kmi = WM_keymap_add_item(keymap, "NODE_OT_select", ACTIONMOUSE, KM_PRESS, 0, 0);
RNA_boolean_set(kmi->ptr, "extend", FALSE);
kmi = WM_keymap_add_item(keymap, "NODE_OT_select", SELECTMOUSE, KM_PRESS, 0, 0);
@@ -154,7 +156,10 @@
RNA_boolean_set(kmi->ptr, "tweak", TRUE);
/* each of these falls through if not handled... */
- WM_keymap_add_item(keymap, "NODE_OT_link", LEFTMOUSE, KM_PRESS, 0, 0);
+ kmi = WM_keymap_add_item(keymap, "NODE_OT_link", LEFTMOUSE, KM_PRESS, 0, 0);
+ RNA_boolean_set(kmi->ptr, "expose", FALSE);
+ kmi = WM_keymap_add_item(keymap, "NODE_OT_link", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
+ RNA_boolean_set(kmi->ptr, "expose", TRUE);
WM_keymap_add_item(keymap, "NODE_OT_resize", LEFTMOUSE, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "NODE_OT_links_cut", LEFTMOUSE, KM_PRESS, KM_CTRL, 0);
« no previous file with comments | « source/blender/editors/space_node/node_intern.h ('k') | source/blender/editors/space_node/node_select.c » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b