[Bf-blender-cvs] [ce2368cf69f] master: Fix T69122: Area Join Error on Invalid Cursor Position

[Harley Acheson]

Commit: ce2368cf69f5124e0450efb759f2343735c37616
Author: Harley Acheson
Date:   Mon Aug 26 13:39:25 2019 -0700
Branches: master
https://developer.blender.org/rBce2368cf69f5124e0450efb759f2343735c37616

Fix T69122: Area Join Error on Invalid Cursor Position

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

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

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/editors/screen/screen_ops.c
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 5557cda2a6d..61cb42387d1 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 5557cda2a6dc34fc2e18d89fde8e5aa50e374e33
+Subproject commit 61cb42387d1356c168d0e89acaef44a5e365520a
diff --git a/release/scripts/addons b/release/scripts/addons
index 4a66c4e0b80..6361074c405 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 4a66c4e0b80f5483c8434554c615a56fef71d627
+Subproject commit 6361074c40587f114285542897ffc830902088d3
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 80e2be8ff8e..8b5ea4d118e 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 80e2be8ff8e23dad3487d4ceef82ce7067cee412
+Subproject commit 8b5ea4d118e56111999832dcbc83020483414239
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 417bdf84232..0ab21990086 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -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;
 
diff --git a/source/tools b/source/tools
index cc8fcc22946..2550eda6bce 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit cc8fcc2294682c7608665e6e0180f0449aad230d
+Subproject commit 2550eda6bcefad45289acbb4b8e52107e742ce1f