diff options
Diffstat (limited to 'source/blender/editors/space_node')
| -rw-r--r-- | source/blender/editors/space_node/node_edit.c | 14 | ||||
| -rw-r--r-- | source/blender/editors/space_node/space_node.c | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 9d81994bb0b..e50f5a818aa 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -819,7 +819,7 @@ static int edit_node_invoke_properties(bContext *C, wmOperator *op) } static void edit_node_properties_get( - wmOperator *op, bNodeTree *ntree, bNode **rnode, bNodeSocket **rsock, int *rin_out) + wmOperator *op, bNodeTree *ntree, bNode **r_node, bNodeSocket **r_sock, int *r_in_out) { bNode *node; bNodeSocket *sock = NULL; @@ -842,14 +842,14 @@ static void edit_node_properties_get( break; } - if (rnode) { - *rnode = node; + if (r_node) { + *r_node = node; } - if (rsock) { - *rsock = sock; + if (r_sock) { + *r_sock = sock; } - if (rin_out) { - *rin_out = in_out; + if (r_in_out) { + *r_in_out = in_out; } } #endif diff --git a/source/blender/editors/space_node/space_node.c b/source/blender/editors/space_node/space_node.c index ce351595522..32007d5b971 100644 --- a/source/blender/editors/space_node/space_node.c +++ b/source/blender/editors/space_node/space_node.c @@ -635,7 +635,7 @@ static void node_main_region_draw(const bContext *C, ARegion *region) static bool node_ima_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event), - const char **UNUSED(tooltip)) + const char **UNUSED(r_tooltip)) { if (drag->type == WM_DRAG_PATH) { /* rule might not work? */ @@ -649,7 +649,7 @@ static bool node_ima_drop_poll(bContext *UNUSED(C), static bool node_mask_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event), - const char **UNUSED(tooltip)) + const char **UNUSED(r_tooltip)) { return WM_drag_ID(drag, ID_MSK) != NULL; } |