From d5c24f2030ecbd109f54bd49c254fd028c30cc00 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 7 Jan 2019 09:12:14 +1100 Subject: Correct error in recent button type check --- source/blender/editors/interface/interface_handlers.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source/blender/editors/interface') diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 91b9ba03fa2..32cd22b0368 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -1125,14 +1125,12 @@ static bool ui_multibut_states_tag( static void ui_multibut_states_create(uiBut *but_active, uiHandleButtonData *data) { - uiBut *but; - BLI_assert(data->multi_data.init == BUTTON_MULTI_INIT_SETUP); BLI_assert(data->multi_data.has_mbuts); data->multi_data.bs_mbuts = UI_butstore_create(but_active->block); - for (but = but_active->block->buttons.first; but; but = but->next) { + for (uiBut *but = but_active->block->buttons.first; but; but = but->next) { if (but->flag & UI_BUT_DRAG_MULTI) { ui_multibut_add(data, but); } @@ -1142,7 +1140,7 @@ static void ui_multibut_states_create(uiBut *but_active, uiHandleButtonData *dat * note: if we mix buttons which are proportional and others which are not, * this may work a bit strangely */ if ((but_active->rnaprop && (RNA_property_flag(but_active->rnaprop) & PROP_PROPORTIONAL)) || - ELEM(but->unit_type, PROP_UNIT_LENGTH)) + ELEM(but_active->unit_type, PROP_UNIT_LENGTH)) { if (data->origvalue != 0.0) { data->multi_data.is_proportional = true; -- cgit v1.2.3