griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T83504: Cancel trim operators when there is no geometry

Browse Source 
The boolean solver crashes when there is no geometry in the mesh. Also,
using the trimming tools without a valid intersection in the PBVH will
make the orientation and position functionality of the trimming shape
not work, so this is the safer solution.

Reviewed By: mont29

Maniphest Tasks: T83504

Differential Revision: https://developer.blender.org/D9777
This commit is contained in:
Pablo Dobarro
2020-12-07 17:32:52 +01:00
parent c9de65679b
commit 288f2efbd4
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/sculpt_paint/paint_mask.c
View File

@@ -1552,6 +1552,11 @@ static int sculpt_trim_gesture_box_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
}
if (ss->totvert == 0) {
/* No geometry to trim or to detect a valid position for the trimming shape. */
return OPERATOR_CANCELLED;
}
SculptGestureContext *sgcontext = sculpt_gesture_init_from_box(C, op);
if (!sgcontext) {
return OPERATOR_CANCELLED;
@@ -1589,6 +1594,11 @@ static int sculpt_trim_gesture_lasso_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
}
if (ss->totvert == 0) {
/* No geometry to trim or to detect a valid position for the trimming shape. */
return OPERATOR_CANCELLED;
}
SculptGestureContext *sgcontext = sculpt_gesture_init_from_lasso(C, op);
if (!sgcontext) {
return OPERATOR_CANCELLED;