From 2dc75555224745c24a03211d33c9bbfa444c8ee1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 8 Jun 2018 18:52:00 +0200 Subject: WM: fix node link & background drag --- source/blender/editors/space_node/node_relationships.c | 11 +++++++---- source/blender/editors/space_node/node_view.c | 11 ++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c index b0d8b51f8e2..682174ebbed 100644 --- a/source/blender/editors/space_node/node_relationships.c +++ b/source/blender/editors/space_node/node_relationships.c @@ -726,11 +726,14 @@ static int node_link_modal(bContext *C, wmOperator *op, const wmEvent *event) case RIGHTMOUSE: case MIDDLEMOUSE: { - node_link_exit(C, op, true); + if (event->val == KM_RELEASE) { + node_link_exit(C, op, true); - ED_area_headerprint(CTX_wm_area(C), NULL); - ED_region_tag_redraw(ar); - return OPERATOR_FINISHED; + ED_area_headerprint(CTX_wm_area(C), NULL); + ED_region_tag_redraw(ar); + return OPERATOR_FINISHED; + } + break; } } diff --git a/source/blender/editors/space_node/node_view.c b/source/blender/editors/space_node/node_view.c index 1cf377643a3..d52a6a89413 100644 --- a/source/blender/editors/space_node/node_view.c +++ b/source/blender/editors/space_node/node_view.c @@ -225,11 +225,12 @@ static int snode_bg_viewmove_modal(bContext *C, wmOperator *op, const wmEvent *e case LEFTMOUSE: case MIDDLEMOUSE: case RIGHTMOUSE: - - MEM_freeN(nvm); - op->customdata = NULL; - - return OPERATOR_FINISHED; + if (event->val == KM_RELEASE) { + MEM_freeN(nvm); + op->customdata = NULL; + return OPERATOR_FINISHED; + } + break; } return OPERATOR_RUNNING_MODAL; -- cgit v1.2.3 From 185782383996d4d2abcf23bdc97688be679b393e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 8 Jun 2018 18:58:41 +0200 Subject: WM: fix panel drag event handling --- source/blender/editors/interface/interface_panel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index 2bb1fc9b144..2c57c802542 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -2052,7 +2052,7 @@ static int ui_handler_panel(bContext *C, const wmEvent *event, void *userdata) uiHandlePanelData *data = panel->activedata; /* verify if we can stop */ - if (event->type == LEFTMOUSE && event->val != KM_PRESS) { + if (event->type == LEFTMOUSE && event->val == KM_RELEASE) { ScrArea *sa = CTX_wm_area(C); ARegion *ar = CTX_wm_region(C); int align = panel_aligned(sa, ar); -- cgit v1.2.3