diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2016-09-19 02:49:17 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2016-09-19 02:49:17 +0300 |
| commit | 976e591e93dd97de2c8f5be639a78c22e6505bae (patch) | |
| tree | 12bcc68b21c2e049ed433c80c3016851fcd67064 /source/blender/editors/interface/interface_handlers.c | |
| parent | 404a427dfdee0f5300b7c4f375cd7ff4a0b8bc8e (diff) | |
Cleanup: Completely replace/remove uiBut.lock
Old leftover from pre 2.5 days. Now handled through UI_BUT_DISABLED button flag.
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 4972e16bf2e..5e9fc53de16 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -2248,7 +2248,7 @@ static void ui_but_copy_paste(bContext *C, uiBut *but, uiHandleButtonData *data, bool buf_paste_alloc = false; bool show_report = false; /* use to display errors parsing paste input */ - if (mode == 'v' && but->lock == true) { + if (mode == 'v' && (but->flag & UI_BUT_DISABLED)) { return; } @@ -7100,8 +7100,7 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, const wmEvent * /* verify if we can edit this button */ if (ELEM(event->type, LEFTMOUSE, RETKEY)) { - /* this should become disabled button .. */ - if (but->lock == true) { + if (but->flag & UI_BUT_DISABLED) { if (but->lockstr) { WM_report(RPT_INFO, but->lockstr); button_activate_state(C, but, BUTTON_STATE_EXIT); |