Cleanup: naming (inconsistent paint_mode term)

4 files changed, 7 insertions, 7 deletions

diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index 27f85d754cd..3ebe041dd36 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -137,10 +137,10 @@ void BKE_paint_runtime_init(const struct ToolSettings *ts, struct Paint *paint);
 
 void BKE_paint_cavity_curve_preset(struct Paint *p, int preset);
 
-eObjectMode BKE_paint_object_mode_from_paint_mode(ePaintMode mode);
+eObjectMode BKE_paint_object_mode_from_paintmode(ePaintMode mode);
 struct Paint *BKE_paint_get_active_from_paintmode(struct Scene *sce, ePaintMode mode);
 const struct EnumPropertyItem *BKE_paint_get_tool_enum_from_paintmode(ePaintMode mode);
-uint BKE_paint_get_brush_tool_offset_from_paint_mode(const ePaintMode mode);
+uint BKE_paint_get_brush_tool_offset_from_paintmode(const ePaintMode mode);
 struct Paint *BKE_paint_get_active(struct Scene *sce, struct ViewLayer *view_layer);
 struct Paint *BKE_paint_get_active_from_context(const struct bContext *C);
 ePaintMode BKE_paintmode_get_active_from_context(const struct bContext *C);
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 55f6100c7be..86af8604e70 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -386,7 +386,7 @@ void BKE_paint_runtime_init(const ToolSettings *ts, Paint *paint)
 	}
 }
 
-uint BKE_paint_get_brush_tool_offset_from_paint_mode(const ePaintMode mode)
+uint BKE_paint_get_brush_tool_offset_from_paintmode(const ePaintMode mode)
 {
 	switch (mode) {
 		case ePaintTexture2D:
@@ -602,7 +602,7 @@ void BKE_paint_cavity_curve_preset(Paint *p, int preset)
 	curvemapping_changed(p->cavity_curve, false);
 }
 
-eObjectMode BKE_paint_object_mode_from_paint_mode(ePaintMode mode)
+eObjectMode BKE_paint_object_mode_from_paintmode(ePaintMode mode)
 {
 	switch (mode) {
 		case ePaintSculpt:
@@ -689,7 +689,7 @@ void BKE_paint_init(Main *bmain, Scene *sce, ePaintMode mode, const char col[3])
 	/* If there's no brush, create one */
 	brush = BKE_paint_brush(paint);
 	if (brush == NULL) {
-		eObjectMode ob_mode = BKE_paint_object_mode_from_paint_mode(mode);
+		eObjectMode ob_mode = BKE_paint_object_mode_from_paintmode(mode);
 		brush = BKE_brush_first_search(bmain, ob_mode);
 
 		if (!brush) {
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index cae7f2a05c4..79d0c9852de 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -1759,7 +1759,7 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id)
 		}
 		else if (paint_mode != ePaintInvalid) {
 			items = BKE_paint_get_tool_enum_from_paintmode(paint_mode);
-			const uint tool_offset = BKE_paint_get_brush_tool_offset_from_paint_mode(paint_mode);
+			const uint tool_offset = BKE_paint_get_brush_tool_offset_from_paintmode(paint_mode);
 			const int tool_type = *(char *)POINTER_OFFSET(br, tool_offset);
 			if (!items || !RNA_enum_icon_from_value(items, tool_type, &id->icon_id)) {
 				id->icon_id = 0;
diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c
index a4da0789be3..be59d8e2c71 100644
--- a/source/blender/editors/sculpt_paint/paint_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_ops.c
@@ -82,7 +82,7 @@ static int brush_add_exec(bContext *C, wmOperator *UNUSED(op))
 		br = BKE_brush_copy(bmain, br);
 	}
 	else {
-		br = BKE_brush_add(bmain, "Brush", BKE_paint_object_mode_from_paint_mode(mode));
+		br = BKE_brush_add(bmain, "Brush", BKE_paint_object_mode_from_paintmode(mode));
 		id_us_min(&br->id);  /* fake user only */
 	}