From bcc9a235487e9607204475ce66140d4cef3d59bf Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Mon, 6 Apr 2015 23:10:21 +0200 Subject: Various Sticky fixes (tm) * Revert 776bfa64a53191b and c3dad7953afccd4 (some X11 systems are doing stupid things forcing me to do an extra check that completely breaks the click type handling on other systems using the slightly changed implementation from those commits - see T44278) * Fix sample lines in Compositor+VSE (And yes, this time I tested on both of my systems to make sure everything is fine) --- source/blender/editors/space_node/node_view.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/space_node') diff --git a/source/blender/editors/space_node/node_view.c b/source/blender/editors/space_node/node_view.c index 3491ecc86af..dda84eb0cbf 100644 --- a/source/blender/editors/space_node/node_view.c +++ b/source/blender/editors/space_node/node_view.c @@ -609,8 +609,11 @@ static int sample_modal(bContext *C, wmOperator *op, const wmEvent *event) switch (event->type) { case LEFTMOUSE: case RIGHTMOUSE: // XXX hardcoded - sample_exit(C, op); - return OPERATOR_CANCELLED; + if (event->val == KM_RELEASE) { + sample_exit(C, op); + return OPERATOR_CANCELLED; + } + break; case MOUSEMOVE: sample_apply(C, op, event); break; -- cgit v1.2.3