From ca4e8b423e81f2a72cd5409d1c2c0450e12afc78 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 10 Jan 2020 16:54:17 +0100 Subject: Cleanup: simplify wmEvent tablet data storage and naming Removing meaningless distinction between NULL pointer and EVT_TABLET_NONE, and initialize pressure and tilt to 1.0 and 0.0 respectively when no tablet is used. --- source/blender/editors/curve/editcurve_paint.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'source/blender/editors/curve') diff --git a/source/blender/editors/curve/editcurve_paint.c b/source/blender/editors/curve/editcurve_paint.c index 4c4bac6a249..5486d60d5d7 100644 --- a/source/blender/editors/curve/editcurve_paint.c +++ b/source/blender/editors/curve/editcurve_paint.c @@ -460,14 +460,8 @@ static void curve_draw_event_add(wmOperator *op, const wmEvent *event) ARRAY_SET_ITEMS(selem->mval, event->mval[0], event->mval[1]); - /* handle pressure sensitivity (which is supplied by tablets) */ - if (event->tablet_data) { - const wmTabletData *wmtab = event->tablet_data; - selem->pressure = wmtab->Pressure; - } - else { - selem->pressure = 1.0f; - } + /* handle pressure sensitivity (which is supplied by tablets or otherwise 1.0) */ + selem->pressure = event->tablet.pressure; bool is_depth_found = stroke_elem_project_fallback_elem( cdd, cdd->prev.location_world_valid, selem); -- cgit v1.2.3