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
This commit is contained in:
Submodule release/datafiles/locale updated: 5557cda2a6...61cb42387d
Submodule release/scripts/addons updated: 4a66c4e0b8...6361074c40
Submodule release/scripts/addons_contrib updated: 80e2be8ff8...8b5ea4d118
@@ -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;
|
||||
|
||||
|
||||
Submodule source/tools updated: cc8fcc2294...2550eda6bc
Reference in New Issue
Block a user