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

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Hans Goudey
2024-03-05 09:53:18 -05:00
parent f2ab2ad8da 4d8dad056c
commit b4bce46410
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/sculpt_paint/paint_mask.cc
View File

@@ -1036,6 +1036,7 @@ static void sculpt_gesture_trim_geometry_generate(gesture::GestureData *gesture_
ARegion *region = vc->region;
const int tot_screen_points = gesture_data->tot_gesture_points;
BLI_assert(tot_screen_points > 1);
float(*screen_points)[2] = gesture_data->gesture_points;
const int trim_totverts = tot_screen_points * 2;

6
source/blender/editors/sculpt_paint/sculpt_gesture.cc
View File

@@ -104,6 +104,12 @@ GestureData *init_from_lasso(bContext *C, wmOperator *op)
return nullptr;
}
/* A single point is equally as invalid for a lasso gesture as no points. */
if (mcoords_len == 1) {
MEM_freeN((void *)mcoords);
return nullptr;
}
gesture_data->lasso.projviewobjmat = ED_view3d_ob_project_mat_get(gesture_data->vc.rv3d,
gesture_data->vc.obact);
BLI_lasso_boundbox(&gesture_data->lasso.boundbox, mcoords, mcoords_len);