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

Fix #148064: Crash when using grease pencil fill tool

Browse Source 
The recently introduced size, strength, and jitter pressure curves
affect most paint code. This exposed further odd behavior inside
`paint_brush_update` where the size pressure curve was being evaluated
even if the brush's size did not vary with pressure.

To fix this issue, this commit clarifies a few comments and updates the
code flow such that cached input values and evaluated pressure values
are used more consistently.

Pull Request: https://projects.blender.org/blender/blender/pulls/148077
This commit is contained in:
Sean Kim
2025-10-16 22:43:32 +02:00
committed by Sean Kim
parent 9d436aa31d
commit fd3d9f2fa2
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_paint_types.hh
View File

@@ -95,7 +95,7 @@ struct PaintRuntime : NonCopyable, NonMovable {
float initial_pixel_radius = 0.0f; float initial_pixel_radius = 0.0f;
float start_pixel_radius = 0.0f; float start_pixel_radius = 0.0f;
/** Drawing pressure. */ /** Evaluated size pressure value */
float size_pressure_value = 0.0f; float size_pressure_value = 0.0f;
/** Position of mouse, used to sample the texture. */ /** Position of mouse, used to sample the texture. */

16
source/blender/editors/sculpt_paint/paint_stroke.cc
View File

@@ -350,21 +350,23 @@ bool paint_brush_update(bContext *C,
if (paint_supports_dynamic_size(brush, mode)) { if (paint_supports_dynamic_size(brush, mode)) {
copy_v2_v2(paint_runtime.tex_mouse, mouse); copy_v2_v2(paint_runtime.tex_mouse, mouse);
copy_v2_v2(paint_runtime.mask_tex_mouse, mouse); copy_v2_v2(paint_runtime.mask_tex_mouse, mouse);
stroke->cached_size_pressure = BKE_curvemapping_evaluateF(brush.curve_size, 0, pressure);
} }
/* Truly temporary data that isn't stored in properties */ /* Truly temporary data that isn't stored in properties */
paint_runtime.stroke_active = true; paint_runtime.stroke_active = true;
paint_runtime.size_pressure_value = stroke->cached_size_pressure; const float pressure_to_evaluate = paint_supports_dynamic_size(brush, mode) ?
pressure :
stroke->cached_size_pressure;
paint_runtime.size_pressure_value = BKE_brush_use_size_pressure(&brush) ?
BKE_curvemapping_evaluateF(
brush.curve_size, 0, pressure_to_evaluate) :
1.0f;
paint_runtime.pixel_radius = BKE_brush_radius_get(paint, &brush); paint_runtime.pixel_radius = BKE_brush_radius_get(paint, &brush) *
paint_runtime.size_pressure_value;
paint_runtime.initial_pixel_radius = BKE_brush_radius_get(paint, &brush); paint_runtime.initial_pixel_radius = BKE_brush_radius_get(paint, &brush);
if (BKE_brush_use_size_pressure(&brush) && paint_supports_dynamic_size(brush, mode)) {
paint_runtime.pixel_radius *= stroke->cached_size_pressure;
}
if (paint_supports_dynamic_tex_coords(brush, mode)) { if (paint_supports_dynamic_tex_coords(brush, mode)) {
if (ELEM(brush.mtex.brush_map_mode, if (ELEM(brush.mtex.brush_map_mode,