Merging r58475 through r58700 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / editors / space_node / node_relationships.c
index beea4dc3183935259c5dc834b413e8444c846197..244b222811ec81ab17e8670af2d97a7c1466a346 100644 (file)
@@ -356,7 +356,7 @@ static int node_link_viewer(const bContext *C, bNode *tonode)
 }
 
 
-static int node_active_link_viewer(bContext *C, wmOperator *UNUSED(op))
+static int node_active_link_viewer_exec(bContext *C, wmOperator *UNUSED(op))
 {
        SpaceNode *snode = CTX_wm_space_node(C);
        bNode *node;
@@ -385,7 +385,7 @@ void NODE_OT_link_viewer(wmOperatorType *ot)
        ot->idname = "NODE_OT_link_viewer";
 
        /* api callbacks */
-       ot->exec = node_active_link_viewer;
+       ot->exec = node_active_link_viewer_exec;
        ot->poll = composite_node_editable;
 
        /* flags */