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

Fix: GPv3: Bracket keys [ and ] don't change the brush size

Browse Source 
The keyboard shortcuts `[` and `]` should change the brush size, but
they didn't for the tools in GPv3 because GPv3 switched to the 'unified
paint settings' system for brushes.

This PR is a fix for that. The brush scale size operator now also acts
on the unified brush size for GPv3 brushes. One exception: the Grease
Pencil brushes in Paint mode (Draw, Erase, Tint), because they don't
use the unified paint settings.

Pull Request: https://projects.blender.org/blender/blender/pulls/124069
This commit is contained in:
Sietse Brouwer
2024-07-04 10:16:12 +02:00
committed by Falk David
parent 717c970297
commit dd5f34eb51
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
source/blender/editors/sculpt_paint/paint_ops.cc
View File

@@ -268,14 +268,16 @@ static int brush_scale_size_exec(bContext *C, wmOperator *op)
Scene *scene = CTX_data_scene(C);
Paint *paint = BKE_paint_get_active_from_context(C);
Brush *brush = BKE_paint_brush(paint);
const bool is_gpencil = (brush && brush->gpencil_settings != nullptr);
// Object *ob = CTX_data_active_object(C);
float scalar = RNA_float_get(op->ptr, "scalar");
/* Grease Pencil brushes in Paint mode do not use unified size. */
const bool use_unified_size = !(brush && brush->gpencil_settings &&
brush->ob_mode == OB_MODE_PAINT_GPENCIL_LEGACY);
if (brush) {
/* pixel radius */
/* Pixel radius. */
{
const int old_size = (!is_gpencil) ? BKE_brush_size_get(scene, brush) : brush->size;
const int old_size = (use_unified_size) ? BKE_brush_size_get(scene, brush) : brush->size;
int size = int(scalar * old_size);
if (abs(old_size - size) < U.pixelsize) {
@@ -286,25 +288,31 @@ static int brush_scale_size_exec(bContext *C, wmOperator *op)
size -= U.pixelsize;
}
}
/* Grease Pencil does not use unified size. */
if (is_gpencil) {
brush->size = max_ii(size, 1);
WM_main_add_notifier(NC_BRUSH | NA_EDITED, brush);
return OPERATOR_FINISHED;
}
BKE_brush_size_set(scene, brush, size);
if (use_unified_size) {
BKE_brush_size_set(scene, brush, size);
}
else {
brush->size = max_ii(size, 1);
}
}
/* unprojected radius */
/* Unprojected radius. */
{
float unprojected_radius = scalar * BKE_brush_unprojected_radius_get(scene, brush);
float unprojected_radius = scalar * (use_unified_size ?
BKE_brush_unprojected_radius_get(scene, brush) :
brush->unprojected_radius);
if (unprojected_radius < 0.001f) { /* XXX magic number */
unprojected_radius = 0.001f;
}
BKE_brush_unprojected_radius_set(scene, brush, unprojected_radius);
if (use_unified_size) {
BKE_brush_unprojected_radius_set(scene, brush, unprojected_radius);
}
else {
brush->unprojected_radius = unprojected_radius;
}
}
WM_main_add_notifier(NC_BRUSH | NA_EDITED, brush);