rename UI_OT_eyedropper to UI_OT_eyedropper_color to make way for other kinds of...
authorCampbell Barton <ideasman42@gmail.com>
Tue, 8 Oct 2013 10:52:33 +0000 (10:52 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 8 Oct 2013 10:52:33 +0000 (10:52 +0000)
source/blender/editors/interface/interface_ops.c
source/blender/editors/interface/interface_regions.c

index d52702c2d518f9e2a11b8d78784c1e9badcdaf24..c94267753bbcb2fa87145c3e3255b0d08c17ef08 100644 (file)
@@ -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);
index 35741618211723a109aea4fdf1c1c6e1862c4820..15fbd51c6fccf0648483ba09f3fab73de9d9a692 100644 (file)
@@ -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);
        }