From 0ab21bf06ae021539c91d24d772813b6132ba382 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Thu, 13 Aug 2020 21:33:47 -0400 Subject: UI Code Quality: Use derived struct for curve mapping buttons The same changes as in rB570044e9f412. --- source/blender/editors/interface/interface_draw.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'source/blender/editors/interface/interface_draw.c') diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index aad3b4d15a1..1ed43697cd1 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -1888,14 +1888,9 @@ static void gl_shaded_color(const uchar *color, int shade) void ui_draw_but_CURVE(ARegion *region, uiBut *but, const uiWidgetColors *wcol, const rcti *rect) { - CurveMapping *cumap; - - if (but->editcumap) { - cumap = but->editcumap; - } - else { - cumap = (CurveMapping *)but->poin; - } + uiButCurveMapping *but_cumap = (uiButCurveMapping *)but; + CurveMapping *cumap = (but_cumap->edit_cumap == NULL) ? (CurveMapping *)but->poin : + but_cumap->edit_cumap; float clip_size_x = BLI_rctf_size_x(&cumap->curr); float clip_size_y = BLI_rctf_size_y(&cumap->curr); -- cgit v1.2.3