blender
/
blender
134
399
Fork 581
Code Issues 6.3k Pull Requests 753 Projects 19 Wiki Activity

Fix T72647: Check if the PBVH type makes sense for the sampling mode 

Before this it was possible to use the operator with Dyntopo sample mode
with a PBVH type GRIDS or FACES, causing a crash. Now we check first if
the PBVH type is correct before calling the sampling function.

We also check if the PBVH exists, which may also cause a crash.

Reviewed By: jbakker

Maniphest Tasks: T72647

Differential Revision: https://developer.blender.org/D6475
This commit is contained in:
Pablo Dobarro 2019-12-24 00:34:37 +01:00
parent bc9c8c35e1
commit 4f70af34e0
Notes: blender-bot 2023-02-14 05:25:44 +01:00 
Referenced by issue #72647, Sculpt mode crash - Sampling detail size (DYNTOPO) while having dyntopo toggled off crashes blender
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/editors/sculpt_paint/sculpt.c
View File

@ -8845,14 +8845,14 @@ static void sample_detail_dyntopo(bContext *C, ViewContext *vc, ARegion *ar, int
}
}
static void sample_detail(bContext *C, int mx, int my, int mode)
static int sample_detail(bContext *C, int mx, int my, int mode)
{
/* Find 3D view to pick from. */
bScreen *screen = CTX_wm_screen(C);
ScrArea *sa = BKE_screen_find_area_xy(screen, SPACE_VIEW3D, mx, my);
ARegion *ar = (sa) ? BKE_area_find_region_xy(sa, RGN_TYPE_WINDOW, mx, my) : NULL;
if (ar == NULL) {
return;
return OPERATOR_CANCELLED;
}
/* Set context to 3D view. */
@ -8865,12 +8865,29 @@ static void sample_detail(bContext *C, int mx, int my, int mode)
ViewContext vc;
ED_view3d_viewcontext_init(C, &vc, depsgraph);
Object *ob = vc.obact;
SculptSession *ss = ob->sculpt;
if (!ss->pbvh) {
return OPERATOR_CANCELLED;
}
/* Pick sample detail. */
switch (mode) {
case SAMPLE_DETAIL_DYNTOPO:
if (BKE_pbvh_type(ss->pbvh) != PBVH_BMESH) {
CTX_wm_area_set(C, prev_sa);
CTX_wm_region_set(C, prev_ar);
return OPERATOR_CANCELLED;
}
sample_detail_dyntopo(C, &vc, ar, mx, my);
break;
case SAMPLE_DETAIL_VOXEL:
if (BKE_pbvh_type(ss->pbvh) != PBVH_FACES) {
CTX_wm_area_set(C, prev_sa);
CTX_wm_region_set(C, prev_ar);
return OPERATOR_CANCELLED;
}
sample_detail_voxel(C, &vc, mx, my);
break;
}
@ -8878,6 +8895,8 @@ static void sample_detail(bContext *C, int mx, int my, int mode)
/* Restore context. */
CTX_wm_area_set(C, prev_sa);
CTX_wm_region_set(C, prev_ar);
return OPERATOR_FINISHED;
}
static int sculpt_sample_detail_size_exec(bContext *C, wmOperator *op)
@ -8885,8 +8904,7 @@ static int sculpt_sample_detail_size_exec(bContext *C, wmOperator *op)
int ss_co[2];
RNA_int_get_array(op->ptr, "location", ss_co);
int mode = RNA_enum_get(op->ptr, "mode");
sample_detail(C, ss_co[0], ss_co[1], mode);
return OPERATOR_FINISHED;
return sample_detail(C, ss_co[0], ss_co[1], mode);
}
static int sculpt_sample_detail_size_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(e))