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

Fix: Anchored, Line, Drag Dot stroke types do not support pen flip mode

Browse Source 
While these modes do not use tablet pressure, they should still read
event data so that the pen status is set correctly.

Pull Request: https://projects.blender.org/blender/blender/pulls/129574
This commit is contained in:
Sean Kim
2024-10-30 22:57:42 +01:00
committed by Sean Kim
parent a48f7f67f7
commit f52ee63114
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1463,7 +1463,6 @@ int paint_stroke_modal(bContext *C, wmOperator *op, const wmEvent *event, PaintS
bool first_dab = false;
bool first_modal = false;
bool redraw = false;
float pressure;
if (event->type == INBETWEEN_MOUSEMOVE &&
!image_paint_brush_type_require_inbetween_mouse_events(*br, mode))
@@ -1472,9 +1471,9 @@ int paint_stroke_modal(bContext *C, wmOperator *op, const wmEvent *event, PaintS
}
/* see if tablet affects event. Line, anchored and drag dot strokes do not support pressure */
pressure = ((br->flag & (BRUSH_LINE | BRUSH_ANCHORED | BRUSH_DRAG_DOT)) ?
1.0f :
WM_event_tablet_data(event, &stroke->pen_flip, nullptr));
const float tablet_pressure = WM_event_tablet_data(event, &stroke->pen_flip, nullptr);
float pressure = ((br->flag & (BRUSH_LINE | BRUSH_ANCHORED | BRUSH_DRAG_DOT)) ? 1.0f :
tablet_pressure);
/* When processing a timer event the pressure from the event is 0, so use the last valid
* pressure. */