diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-04-07 17:17:16 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-04-07 17:17:16 +0300 |
| commit | c29d7a2c2b056f9b432a6c6841b78353c6d267a9 (patch) | |
| tree | 7e8f8ff4c69f766ad79aa836d6276a687dfcfcbb /source/blender/editors/space_node | |
| parent | e4f37a50cabe4d67d3f35b5e63de06071f93e9a8 (diff) | |
| parent | f9f3c29a3a5b558e09c36076521bdafc91e7e326 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/blenloader/intern/versioning_270.c
Diffstat (limited to 'source/blender/editors/space_node')
| -rw-r--r-- | source/blender/editors/space_node/node_relationships.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c index f72def8377f..c8951a1172e 100644 --- a/source/blender/editors/space_node/node_relationships.c +++ b/source/blender/editors/space_node/node_relationships.c @@ -633,14 +633,11 @@ static int node_link_modal(bContext *C, wmOperator *op, const wmEvent *event) case RIGHTMOUSE: case MIDDLEMOUSE: { - if (event->val != KM_NOTHING) { - node_link_exit(C, op, true); - - ED_area_headerprint(CTX_wm_area(C), NULL); - ED_region_tag_redraw(ar); - return OPERATOR_FINISHED; - } - break; + node_link_exit(C, op, true); + + ED_area_headerprint(CTX_wm_area(C), NULL); + ED_region_tag_redraw(ar); + return OPERATOR_FINISHED; } } |