sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T69122: Area Join Error on Invalid Cursor Position

Browse Source 
Improved error handling of Join Area operator in cased it is passed cursor position that is not valid.

Differential Revision: https://developer.blender.org/D5598

Reviewed by Brecht Van Lommel
This commit is contained in:
Harley Acheson 2019-08-26 13:39:25 -07:00
parent 378a13483f
commit ce2368cf69
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/datafiles/locale

@ -1 +1 @@
Subproject commit 5557cda2a6dc34fc2e18d89fde8e5aa50e374e33
Subproject commit 61cb42387d1356c168d0e89acaef44a5e365520a

2
release/scripts/addons

@ -1 +1 @@
Subproject commit 4a66c4e0b80f5483c8434554c615a56fef71d627
Subproject commit 6361074c40587f114285542897ffc830902088d3

2
release/scripts/addons_contrib

@ -1 +1 @@
Subproject commit 80e2be8ff8e23dad3487d4ceef82ce7067cee412
Subproject commit 8b5ea4d118e56111999832dcbc83020483414239

4
source/blender/editors/screen/screen_ops.c
View File

@ -3363,7 +3363,9 @@ static int area_join_modal(bContext *C, wmOperator *op, const wmEvent *event)
sAreaJoinData *jd;
if (op->customdata == NULL) {
area_join_init(C, op, NULL, NULL);
if (!area_join_init(C, op, NULL, NULL)) {
return OPERATOR_CANCELLED;
}
}
jd = (sAreaJoinData *)op->customdata;

2
source/tools

@ -1 +1 @@
Subproject commit cc8fcc2294682c7608665e6e0180f0449aad230d
Subproject commit 2550eda6bcefad45289acbb4b8e52107e742ce1f