diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-10-08 14:52:33 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-10-08 14:52:33 +0400 |
commit | 13a21588ae8289b30b4091d8c5921937ec6416c9 (patch) | |
tree | 5f4b812b3b6cce127503d8c0558c4b5e19e00f6d /source/blender/editors | |
parent | 81c957da6acd8b9532f199d84f3f4ac8c11408f8 (diff) |
rename UI_OT_eyedropper to UI_OT_eyedropper_color to make way for other kinds of eyedroppers.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/interface/interface_ops.c | 6 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_regions.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index d52702c2d51..c94267753bb 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -326,11 +326,11 @@ static int eyedropper_poll(bContext *C) else return 1; } -static void UI_OT_eyedropper(wmOperatorType *ot) +static void UI_OT_eyedropper_color(wmOperatorType *ot) { /* identifiers */ ot->name = "Eyedropper"; - ot->idname = "UI_OT_eyedropper"; + ot->idname = "UI_OT_eyedropper_color"; ot->description = "Sample a color from the Blender Window to store in a property"; /* api callbacks */ @@ -1114,7 +1114,7 @@ static void UI_OT_reloadtranslation(wmOperatorType *ot) void UI_buttons_operatortypes(void) { - WM_operatortype_append(UI_OT_eyedropper); + WM_operatortype_append(UI_OT_eyedropper_color); WM_operatortype_append(UI_OT_reset_default_theme); WM_operatortype_append(UI_OT_copy_data_path_button); WM_operatortype_append(UI_OT_reset_default_button); diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 35741618211..15fbd51c6fc 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -2185,7 +2185,7 @@ static void uiBlockPicker(uiBlock *block, float rgba[4], PointerRNA *ptr, Proper yco = -3.0f * UI_UNIT_Y; if (show_picker) { - bt = uiDefIconButO(block, BUT, "UI_OT_eyedropper", WM_OP_INVOKE_DEFAULT, ICON_EYEDROPPER, butwidth + 10, yco, UI_UNIT_X, UI_UNIT_Y, NULL); + bt = uiDefIconButO(block, BUT, "UI_OT_eyedropper_color", WM_OP_INVOKE_DEFAULT, ICON_EYEDROPPER, butwidth + 10, yco, UI_UNIT_X, UI_UNIT_Y, NULL); uiButSetFunc(bt, close_popup_cb, bt, NULL); } |