diff options
author | Matt Ebb <matt@mke3.net> | 2009-12-04 04:21:55 +0300 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2009-12-04 04:21:55 +0300 |
commit | ae7cf1df8f09b1ab888e69644b664698e9e2aeff (patch) | |
tree | 3f6c0a09b33ac2737dbeb801ffc0b9f5ff1b03e3 /source/blender/editors/screen | |
parent | a657920fba20ed557eba40575cf54d065f8bc9bd (diff) |
Partial fix for [#19874]
can use RMB to cancel joining areas, same as splitting
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); } |