diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-11-02 07:44:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-02 07:45:19 +0300 |
| commit | 4a85089abe6d5abb9f6bb0d8255eba33dc030fcb (patch) | |
| tree | 25459e54af9cf6712ca349b924319939ba853909 /source/blender/editors/interface/interface.c | |
| parent | cf6e45b5224d16263d7c87411a2ff71ed928410f (diff) | |
| parent | 765e28948e706d8fce97c23d4d050a607971488b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/interface.c')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 96273f5e83c..0d166b874cb 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -2678,6 +2678,10 @@ static void ui_but_free(const bContext *C, uiBut *but) MEM_freeN(but->tip_argN); } + if (but->hold_argN) { + MEM_freeN(but->hold_argN); + } + if (!but->editstr && but->free_search_arg) { MEM_SAFE_FREE(but->search_arg); } @@ -4532,6 +4536,12 @@ void UI_but_focus_on_enter_event(wmWindow *win, uiBut *but) wm_event_add(win, &event); } +void UI_but_func_hold_set(uiBut *but, uiButHandleHoldFunc func, void *argN) +{ + but->hold_func = func; + but->hold_argN = argN; +} + void UI_but_string_info_get(bContext *C, uiBut *but, ...) { va_list args; |