diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-06-22 01:22:47 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-06-22 01:27:56 +0300 |
commit | 63f62cd757a6e102cbf6dc97215d9291f9c92a2d (patch) | |
tree | f8a0b3045915786bb2a7712ab720e26588ff0388 /source/blender/editors/interface/interface_handlers.c | |
parent | 857c9e14f7d945153ef2873fa6c9c508bd4cd882 (diff) |
Fix memory leak /w multi-drag over a single button
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 6226ca56a2c..1a1d5606242 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -1062,6 +1062,7 @@ static void ui_multibut_states_create(uiBut *but_active, uiHandleButtonData *dat 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); @@ -7032,8 +7033,13 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, const wmEvent * /* just to be sure, check we're dragging more hoz then virt */ abs(event->prevx - event->x) > abs(event->prevy - event->y))) { - ui_multibut_states_create(but, data); - data->multi_data.init = BUTTON_MULTI_INIT_ENABLE; + if (data->multi_data.has_mbuts) { + ui_multibut_states_create(but, data); + data->multi_data.init = BUTTON_MULTI_INIT_ENABLE; + } + else { + data->multi_data.init = BUTTON_MULTI_INIT_DISABLE; + } } } |