[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60600] trunk/blender/source/blender/ editors/interface: rename UI_OT_eyedropper to UI_OT_eyedropper_color to make way for other kinds of eyedroppers .

[Campbell Barton]

Revision: 60600
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60600
Author:   campbellbarton
Date:     2013-10-08 10:52:33 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
rename UI_OT_eyedropper to UI_OT_eyedropper_color to make way for other kinds of eyedroppers.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_ops.c
    trunk/blender/source/blender/editors/interface/interface_regions.c

Modified: trunk/blender/source/blender/editors/interface/interface_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_ops.c	2013-10-07 19:45:13 UTC (rev 60599)
+++ trunk/blender/source/blender/editors/interface/interface_ops.c	2013-10-08 10:52:33 UTC (rev 60600)
@@ -326,11 +326,11 @@
 	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 @@
 
 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);

Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c	2013-10-07 19:45:13 UTC (rev 60599)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c	2013-10-08 10:52:33 UTC (rev 60600)
@@ -2185,7 +2185,7 @@
 
 	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);
 	}