From ae7cf1df8f09b1ab888e69644b664698e9e2aeff Mon Sep 17 00:00:00 2001 From: Matt Ebb Date: Fri, 4 Dec 2009 01:21:55 +0000 Subject: Partial fix for [#19874] can use RMB to cancel joining areas, same as splitting --- source/blender/editors/screen/screen_ops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/screen') diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 7780f3e5068..afee27cd0f3 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -1851,7 +1851,8 @@ static int area_join_modal(bContext *C, wmOperator *op, wmEvent *event) return OPERATOR_FINISHED; } break; - + + case RIGHTMOUSE: case ESCKEY: return area_join_cancel(C, op); } -- cgit v1.2.3