Cleanup: rename color band to color ramp

5 files changed, 15 insertions, 15 deletions

diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c
index 112fde4a15c..f47e0bc4b54 100644
--- a/source/blender/editors/interface/interface_eyedropper.c
+++ b/source/blender/editors/interface/interface_eyedropper.c
@@ -64,7 +64,7 @@ wmKeyMap *eyedropper_modal_keymap(wmKeyConfig *keyconf)
 	keymap = WM_modalkeymap_add(keyconf, "Eyedropper Modal Map", modal_items);
 
 	/* assign to operators */
-	WM_modalkeymap_assign(keymap, "UI_OT_eyedropper_colorband");
+	WM_modalkeymap_assign(keymap, "UI_OT_eyedropper_colorramp");
 	WM_modalkeymap_assign(keymap, "UI_OT_eyedropper_color");
 	WM_modalkeymap_assign(keymap, "UI_OT_eyedropper_id");
 	WM_modalkeymap_assign(keymap, "UI_OT_eyedropper_depth");
@@ -83,14 +83,14 @@ wmKeyMap *eyedropper_colorband_modal_keymap(wmKeyConfig *keyconf)
 		{0, NULL, 0, NULL, NULL},
 	};
 
-	wmKeyMap *keymap = WM_modalkeymap_get(keyconf, "Eyedropper ColorBand PointSampling Map");
+	wmKeyMap *keymap = WM_modalkeymap_get(keyconf, "Eyedropper ColorRamp PointSampling Map");
 	if (keymap && keymap->modal_items)
 		return keymap;
 
-	keymap = WM_modalkeymap_add(keyconf, "Eyedropper ColorBand PointSampling Map", modal_items_point);
+	keymap = WM_modalkeymap_add(keyconf, "Eyedropper ColorRamp PointSampling Map", modal_items_point);
 
 	/* assign to operators */
-	WM_modalkeymap_assign(keymap, "UI_OT_eyedropper_colorband_point");
+	WM_modalkeymap_assign(keymap, "UI_OT_eyedropper_colorramp_point");
 
 	return keymap;
 }
diff --git a/source/blender/editors/interface/interface_eyedropper_colorband.c b/source/blender/editors/interface/interface_eyedropper_colorband.c
index 8e588352b56..6c60640b428 100644
--- a/source/blender/editors/interface/interface_eyedropper_colorband.c
+++ b/source/blender/editors/interface/interface_eyedropper_colorband.c
@@ -27,8 +27,8 @@
  * - Clicking on points, adding each color to the end of the color-band.
  *
  * Defines:
- * - #UI_OT_eyedropper_colorband
- * - #UI_OT_eyedropper_colorband_point
+ * - #UI_OT_eyedropper_colorramp
+ * - #UI_OT_eyedropper_colorramp_point
  */
 
 #include "MEM_guardedalloc.h"
@@ -318,11 +318,11 @@ static bool eyedropper_colorband_poll(bContext *C)
 }
 
 
-void UI_OT_eyedropper_colorband(wmOperatorType *ot)
+void UI_OT_eyedropper_colorramp(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name = "Eyedropper colorband";
-	ot->idname = "UI_OT_eyedropper_colorband";
+	ot->idname = "UI_OT_eyedropper_colorramp";
 	ot->description = "Sample a color band";
 
 	/* api callbacks */
@@ -338,11 +338,11 @@ void UI_OT_eyedropper_colorband(wmOperatorType *ot)
 	/* properties */
 }
 
-void UI_OT_eyedropper_colorband_point(wmOperatorType *ot)
+void UI_OT_eyedropper_colorramp_point(wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name = "Eyedropper colorband (points)";
-	ot->idname = "UI_OT_eyedropper_colorband_point";
+	ot->idname = "UI_OT_eyedropper_colorramp_point";
 	ot->description = "Point-sample a color band";
 
 	/* api callbacks */
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 4b35978a9de..369a067f7a3 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -874,8 +874,8 @@ struct wmKeyMap *eyedropper_colorband_modal_keymap(struct wmKeyConfig *keyconf);
 void UI_OT_eyedropper_color(struct wmOperatorType *ot);
 
 /* interface_eyedropper_colorband.c */
-void UI_OT_eyedropper_colorband(struct wmOperatorType *ot);
-void UI_OT_eyedropper_colorband_point(struct wmOperatorType *ot);
+void UI_OT_eyedropper_colorramp(struct wmOperatorType *ot);
+void UI_OT_eyedropper_colorramp_point(struct wmOperatorType *ot);
 
 /* interface_eyedropper_datablock.c */
 void UI_OT_eyedropper_id(struct wmOperatorType *ot);
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index 773d624fd5d..096c717daf3 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -1598,8 +1598,8 @@ void ED_operatortypes_ui(void)
 
 	/* external */
 	WM_operatortype_append(UI_OT_eyedropper_color);
-	WM_operatortype_append(UI_OT_eyedropper_colorband);
-	WM_operatortype_append(UI_OT_eyedropper_colorband_point);
+	WM_operatortype_append(UI_OT_eyedropper_colorramp);
+	WM_operatortype_append(UI_OT_eyedropper_colorramp_point);
 	WM_operatortype_append(UI_OT_eyedropper_id);
 	WM_operatortype_append(UI_OT_eyedropper_depth);
 	WM_operatortype_append(UI_OT_eyedropper_driver);
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index cc28d712ffa..fbd6b1b3ede 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -2411,7 +2411,7 @@ static uiBlock *colorband_tools_func(
 		        IFACE_("Distribute Stops Evenly"), 0, yco -= UI_UNIT_Y, menuwidth, UI_UNIT_Y,
 		        NULL, 0.0, 0.0, 0, CB_FUNC_DISTRIBUTE_EVENLY, "");
 
-		uiItemO(layout, IFACE_("Eyedropper"), ICON_EYEDROPPER, "UI_OT_eyedropper_colorband");
+		uiItemO(layout, IFACE_("Eyedropper"), ICON_EYEDROPPER, "UI_OT_eyedropper_colorramp");
 
 		uiDefIconTextBut(
 		        block, UI_BTYPE_BUT_MENU, 1, ICON_BLANK1, IFACE_("Reset Color Ramp"),