blender
/
blender
134
400
Fork 583
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

Fix T101062: sculpt curves crash using a paintcurve brush 

For one, paintcurves were not considered in curves sculpt mode at all
(so you couldnt draw them). This is now enabled.

And the second issue was that since curves sculpt mode uses the reguar
paint_stroke_modal() [which handles paintcurves], this was actually
excuted, freeing the PaintStroke from SculptCurvesBrushStrokeData (but
not the CurvesSculptStrokeOperation) and immediately return
OPERATOR_FINISHED from modal (resulting in a double MEM_delete of
SculptCurvesBrushStrokeData -- in both invoke and modal).

There might be better ways to handle the memory free, for now the double
freeing is prevented by setting the operator customdata to NULL (and
check for that later).

Maniphest Tasks: T101062

Differential Revision: https://developer.blender.org/D16099
This commit is contained in:
Philipp Oeser 2022-09-29 12:57:48 +02:00
parent 3136fb886e
commit 3f91540cef
Notes: blender-bot 2023-10-12 12:49:04 +02:00 
Referenced by issue #100749, Blender LTS: Maintenance Task 3.3
Referenced by issue #101062, Curves sculptmode: crash when using curve stroke in any tool
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/editors/sculpt_paint/curves_sculpt_ops.cc
View File

@ -220,8 +220,10 @@ static int sculpt_curves_stroke_invoke(bContext *C, wmOperator *op, const wmEven
int return_value = op->type->modal(C, op, event);
if (return_value == OPERATOR_FINISHED) {
paint_stroke_free(C, op, op_data->stroke);
MEM_delete(op_data);
if (op->customdata != nullptr) {
paint_stroke_free(C, op, op_data->stroke);
MEM_delete(op_data);
}
return OPERATOR_FINISHED;
}
@ -236,16 +238,19 @@ static int sculpt_curves_stroke_modal(bContext *C, wmOperator *op, const wmEvent
int return_value = paint_stroke_modal(C, op, event, &op_data->stroke);
if (ELEM(return_value, OPERATOR_FINISHED, OPERATOR_CANCELLED)) {
MEM_delete(op_data);
op->customdata = nullptr;
}
return return_value;
}
static void sculpt_curves_stroke_cancel(bContext *C, wmOperator *op)
{
SculptCurvesBrushStrokeData *op_data = static_cast<SculptCurvesBrushStrokeData *>(
op->customdata);
paint_stroke_cancel(C, op, op_data->stroke);
MEM_delete(op_data);
if (op->customdata != nullptr) {
SculptCurvesBrushStrokeData *op_data = static_cast<SculptCurvesBrushStrokeData *>(
op->customdata);
paint_stroke_cancel(C, op, op_data->stroke);
MEM_delete(op_data);
}
}
static void SCULPT_CURVES_OT_brush_stroke(struct wmOperatorType *ot)

5
source/blender/editors/sculpt_paint/paint_curve.c
View File

@ -44,7 +44,7 @@ bool paint_curve_poll(bContext *C)
RegionView3D *rv3d = CTX_wm_region_view3d(C);
SpaceImage *sima;
if (rv3d && !(ob && ((ob->mode & OB_MODE_ALL_PAINT) != 0))) {
if (rv3d && !(ob && ((ob->mode & (OB_MODE_ALL_PAINT | OB_MODE_SCULPT_CURVES)) != 0))) {
return false;
}
@ -676,6 +676,9 @@ static int paintcurve_draw_exec(bContext *C, wmOperator *UNUSED(op))
case PAINT_MODE_SCULPT:
name = "SCULPT_OT_brush_stroke";
break;
case PAINT_MODE_SCULPT_CURVES:
name = "SCULPT_CURVES_OT_brush_stroke";
break;
default:
return OPERATOR_PASS_THROUGH;
}