diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-01-07 01:12:14 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-07 01:15:07 +0300 |
commit | d5c24f2030ecbd109f54bd49c254fd028c30cc00 (patch) | |
tree | 16de4d97d38574462324dc28fe0d5a9aeda39e1a /source/blender/editors/interface/interface_handlers.c | |
parent | aa6946f6c9a1e24ea429ad989039e574ac9f14cc (diff) |
Correct error in recent button type check
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 6 |
1 files changed, 2 insertions, 4 deletions
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; |