Revision: 61172 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61172 Author: lukastoenne Date: 2013-11-06 18:56:51 +0000 (Wed, 06 Nov 2013) Log Message: ----------- Removed the "Show Cyclic Dependencies" operator for nodes. This operator is an old relic implemented for showing cyclic node connections as red links. This is not necessary any more, the operator simply called the generic node tree update function, which is happening anyway after all relevant node operators (if it doesn't that has to be considered a bug).
It has been suggested to better use the C key for circle select, this remains to be discussed. Modified Paths: -------------- trunk/blender/release/scripts/startup/bl_ui/space_node.py trunk/blender/source/blender/editors/space_node/node_intern.h trunk/blender/source/blender/editors/space_node/node_ops.c trunk/blender/source/blender/editors/space_node/node_relationships.c Modified: trunk/blender/release/scripts/startup/bl_ui/space_node.py =================================================================== --- trunk/blender/release/scripts/startup/bl_ui/space_node.py 2013-11-06 17:53:19 UTC (rev 61171) +++ trunk/blender/release/scripts/startup/bl_ui/space_node.py 2013-11-06 18:56:51 UTC (rev 61172) @@ -233,7 +233,6 @@ layout.separator() - layout.operator("node.show_cyclic_dependencies") layout.operator("node.read_renderlayers") layout.operator("node.read_fullsamplelayers") Modified: trunk/blender/source/blender/editors/space_node/node_intern.h =================================================================== --- trunk/blender/source/blender/editors/space_node/node_intern.h 2013-11-06 17:53:19 UTC (rev 61171) +++ trunk/blender/source/blender/editors/space_node/node_intern.h 2013-11-06 18:56:51 UTC (rev 61172) @@ -169,7 +169,6 @@ void NODE_OT_attach(struct wmOperatorType *ot); void NODE_OT_detach(struct wmOperatorType *ot); -void NODE_OT_show_cyclic_dependencies(struct wmOperatorType *ot); void NODE_OT_link_viewer(struct wmOperatorType *ot); /* node_edit.c */ Modified: trunk/blender/source/blender/editors/space_node/node_ops.c =================================================================== --- trunk/blender/source/blender/editors/space_node/node_ops.c 2013-11-06 17:53:19 UTC (rev 61171) +++ trunk/blender/source/blender/editors/space_node/node_ops.c 2013-11-06 18:56:51 UTC (rev 61172) @@ -70,7 +70,6 @@ WM_operatortype_append(NODE_OT_preview_toggle); WM_operatortype_append(NODE_OT_options_toggle); WM_operatortype_append(NODE_OT_hide_socket_toggle); - WM_operatortype_append(NODE_OT_show_cyclic_dependencies); WM_operatortype_append(NODE_OT_node_copy_color); WM_operatortype_append(NODE_OT_duplicate); @@ -272,8 +271,6 @@ WM_keymap_add_item(keymap, "NODE_OT_preview_toggle", HKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, "NODE_OT_hide_socket_toggle", HKEY, KM_PRESS, KM_CTRL, 0); - WM_keymap_add_item(keymap, "NODE_OT_show_cyclic_dependencies", CKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "NODE_OT_view_all", HOMEKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "NODE_OT_view_selected", PADPERIOD, KM_PRESS, 0, 0); Modified: trunk/blender/source/blender/editors/space_node/node_relationships.c =================================================================== --- trunk/blender/source/blender/editors/space_node/node_relationships.c 2013-11-06 17:53:19 UTC (rev 61171) +++ trunk/blender/source/blender/editors/space_node/node_relationships.c 2013-11-06 18:56:51 UTC (rev 61172) @@ -876,34 +876,6 @@ } -/* ****************** Show Cyclic Dependencies Operator ******************* */ - -static int node_show_cycles_exec(bContext *C, wmOperator *UNUSED(op)) -{ - SpaceNode *snode = CTX_wm_space_node(C); - - /* this is just a wrapper around this call... */ - ntreeUpdateTree(CTX_data_main(C), snode->nodetree); - snode_notify(C, snode); - - return OPERATOR_FINISHED; -} - -void NODE_OT_show_cyclic_dependencies(wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "Show Cyclic Dependencies"; - ot->description = "Sort the nodes and show the cyclic dependencies between the nodes"; - ot->idname = "NODE_OT_show_cyclic_dependencies"; - - /* callbacks */ - ot->exec = node_show_cycles_exec; - ot->poll = ED_operator_node_active; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; -} - /* ****************** Set Parent ******************* */ static int node_parent_set_exec(bContext *C, wmOperator *UNUSED(op)) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs