diff options
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index b5f3a1e59e9..dd0662b1b19 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -1049,7 +1049,7 @@ static void ui_apply_button(bContext *C, uiBlock *block, uiBut *but, uiHandleBut case PULLDOWN: ui_apply_but_BLOCK(C, but, data); break; - case COL: + case COLOR: if (data->cancel) ui_apply_but_VEC(C, but, data); else @@ -1180,7 +1180,7 @@ static void ui_but_copy_paste(bContext *C, uiBut *but, uiHandleButtonData *data, } /* RGB triple */ - else if (but->type == COL) { + else if (but->type == COLOR) { float rgb[3]; if (but->poin == NULL && but->rnapoin.data == NULL) ; @@ -2092,12 +2092,12 @@ static void ui_blockopen_begin(bContext *C, uiBut *but, uiHandleButtonData *data menufunc = ui_block_func_ICONTEXTROW; arg = but; break; - case COL: + case COLOR: ui_get_but_vectorf(but, data->origvec); copy_v3_v3(data->vec, data->origvec); but->editvec = data->vec; - handlefunc = ui_block_func_COL; + handlefunc = ui_block_func_COLOR; arg = but; break; @@ -3001,7 +3001,7 @@ static int ui_do_but_BLOCK(bContext *C, uiBut *but, uiHandleButtonData *data, wm return WM_UI_HANDLER_BREAK; } } - else if (but->type == COL) { + else if (but->type == COLOR) { if (ELEM(event->type, WHEELDOWNMOUSE, WHEELUPMOUSE) && event->alt) { float *hsv = ui_block_hsv_get(but->block); float col[3]; @@ -4908,7 +4908,7 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event) case BUTM: retval = ui_do_but_BUT(C, but, data, event); break; - case COL: + case COLOR: if (but->a1 == UI_GRAD_V_ALT) /* signal to prevent calling up color picker */ retval = ui_do_but_EXIT(C, but, data, event); else @@ -5874,7 +5874,7 @@ static int ui_handle_button_event(bContext *C, wmEvent *event, uiBut *but) } } - if (but->type != COL) { /* exception */ + if (but->type != COLOR) { /* exception */ data->cancel = TRUE; } button_activate_state(C, but, BUTTON_STATE_EXIT); @@ -5984,7 +5984,7 @@ static void ui_handle_button_return_submenu(bContext *C, wmEvent *event, uiBut * /* copy over return values from the closing menu */ if ((menu->menuretval & UI_RETURN_OK) || (menu->menuretval & UI_RETURN_UPDATE)) { - if (but->type == COL) + if (but->type == COLOR) copy_v3_v3(data->vec, menu->retvec); else if (ELEM3(but->type, MENU, ICONROW, ICONTEXTROW)) data->value = menu->retvalue; |