[Bf-blender-cvs] [3196a23] master: Mask slide can be cancelled with RMB now

[Sergey Sharybin]

Commit: 3196a230a6b2481dc4b659bc458aea10f5cdd2ed
Author: Sergey Sharybin
Date:   Tue Aug 19 17:23:02 2014 +0600
Branches: master
https://developer.blender.org/rB3196a230a6b2481dc4b659bc458aea10f5cdd2ed

Mask slide can be cancelled with RMB now

===================================================================

M	source/blender/editors/mask/mask_ops.c

===================================================================

diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c
index a882284..c9eacc8 100644
--- a/source/blender/editors/mask/mask_ops.c
+++ b/source/blender/editors/mask/mask_ops.c
@@ -970,8 +970,12 @@ static int slide_point_modal(bContext *C, wmOperator *op, const wmEvent *event)
 				free_slide_point_data(op->customdata); /* keep this last! */
 				return OPERATOR_FINISHED;
 			}
-
-			break;
+			else if (event->type != data->event_invoke_type && event->val == KM_PRESS) {
+				/* pass to ESCKEY */
+			}
+			else {
+				break;
+			}
 
 		case ESCKEY:
 			cancel_slide_point(op->customdata);