Cleanup: naming for paint modes

- Rename ePaint* -> PAINT_MODE_*.
- Use PAINT_OVERLAY_ prefix for eOverlayControlFlags.

2 files changed, 48 insertions, 45 deletions

diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index a132af41567..eedf5f7985e 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -68,31 +68,34 @@ extern const char PAINT_CURSOR_WEIGHT_PAINT[3];
 extern const char PAINT_CURSOR_TEXTURE_PAINT[3];
 
 typedef enum ePaintMode {
-	ePaintSculpt = 0,
+	PAINT_MODE_SCULPT = 0,
 	/** Vertex color. */
-	ePaintVertex = 1,
-	ePaintWeight = 2,
+	PAINT_MODE_VERTEX = 1,
+	PAINT_MODE_WEIGHT = 2,
 	/** 3D view (projection painting). */
-	ePaintTexture3D = 3,
+	PAINT_MODE_TEXTURE_3D = 3,
 	/** Image space (2D painting). */
-	ePaintTexture2D = 4,
-	ePaintSculptUV = 5,
-	ePaintInvalid = 6
+	PAINT_MODE_TEXTURE_2D = 4,
+	PAINT_MODE_SCULPT_UV = 5,
+
+	/** Keep last. */
+	PAINT_MODE_INVALID = 6
 } ePaintMode;
 
 /* overlay invalidation */
 typedef enum eOverlayControlFlags {
-	PAINT_INVALID_OVERLAY_TEXTURE_PRIMARY = 1,
-	PAINT_INVALID_OVERLAY_TEXTURE_SECONDARY = (1 << 2),
-	PAINT_INVALID_OVERLAY_CURVE = (1 << 3),
+	PAINT_OVERLAY_INVALID_TEXTURE_PRIMARY = 1,
+	PAINT_OVERLAY_INVALID_TEXTURE_SECONDARY = (1 << 2),
+	PAINT_OVERLAY_INVALID_CURVE = (1 << 3),
 	PAINT_OVERLAY_OVERRIDE_CURSOR = (1 << 4),
 	PAINT_OVERLAY_OVERRIDE_PRIMARY = (1 << 5),
 	PAINT_OVERLAY_OVERRIDE_SECONDARY = (1 << 6)
 } eOverlayControlFlags;
 
-#define PAINT_OVERRIDE_MASK (PAINT_OVERLAY_OVERRIDE_SECONDARY | \
-						     PAINT_OVERLAY_OVERRIDE_PRIMARY | \
-						     PAINT_OVERLAY_OVERRIDE_CURSOR)
+#define PAINT_OVERRIDE_MASK \
+	(PAINT_OVERLAY_OVERRIDE_SECONDARY | \
+	 PAINT_OVERLAY_OVERRIDE_PRIMARY | \
+	 PAINT_OVERLAY_OVERRIDE_CURSOR)
 
 void BKE_paint_invalidate_overlay_tex(struct Scene *scene, const struct Tex *tex);
 void BKE_paint_invalidate_cursor_overlay(struct Scene *scene, struct CurveMapping *curve);
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 0541bd58c85..dd5d801d2ac 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -83,9 +83,9 @@ void BKE_paint_invalidate_overlay_tex(Scene *scene, const Tex *tex)
 		return;
 
 	if (br->mtex.tex == tex)
-		overlay_flags |= PAINT_INVALID_OVERLAY_TEXTURE_PRIMARY;
+		overlay_flags |= PAINT_OVERLAY_INVALID_TEXTURE_PRIMARY;
 	if (br->mask_mtex.tex == tex)
-		overlay_flags |= PAINT_INVALID_OVERLAY_TEXTURE_SECONDARY;
+		overlay_flags |= PAINT_OVERLAY_INVALID_TEXTURE_SECONDARY;
 }
 
 void BKE_paint_invalidate_cursor_overlay(Scene *scene, CurveMapping *curve)
@@ -94,14 +94,14 @@ void BKE_paint_invalidate_cursor_overlay(Scene *scene, CurveMapping *curve)
 	Brush *br = p->brush;
 
 	if (br && br->curve == curve)
-		overlay_flags |= PAINT_INVALID_OVERLAY_CURVE;
+		overlay_flags |= PAINT_OVERLAY_INVALID_CURVE;
 }
 
 void BKE_paint_invalidate_overlay_all(void)
 {
-	overlay_flags |= (PAINT_INVALID_OVERLAY_TEXTURE_SECONDARY |
-	                  PAINT_INVALID_OVERLAY_TEXTURE_PRIMARY |
-	                  PAINT_INVALID_OVERLAY_CURVE);
+	overlay_flags |= (PAINT_OVERLAY_INVALID_TEXTURE_SECONDARY |
+	                  PAINT_OVERLAY_INVALID_TEXTURE_PRIMARY |
+	                  PAINT_OVERLAY_INVALID_CURVE);
 }
 
 eOverlayControlFlags BKE_paint_get_overlay_flags(void)
@@ -135,18 +135,18 @@ Paint *BKE_paint_get_active_from_paintmode(Scene *sce, ePaintMode mode)
 		ToolSettings *ts = sce->toolsettings;
 
 		switch (mode) {
-			case ePaintSculpt:
+			case PAINT_MODE_SCULPT:
 				return &ts->sculpt->paint;
-			case ePaintVertex:
+			case PAINT_MODE_VERTEX:
 				return &ts->vpaint->paint;
-			case ePaintWeight:
+			case PAINT_MODE_WEIGHT:
 				return &ts->wpaint->paint;
-			case ePaintTexture2D:
-			case ePaintTexture3D:
+			case PAINT_MODE_TEXTURE_2D:
+			case PAINT_MODE_TEXTURE_3D:
 				return &ts->imapaint.paint;
-			case ePaintSculptUV:
+			case PAINT_MODE_SCULPT_UV:
 				return &ts->uvsculpt->paint;
-			case ePaintInvalid:
+			case PAINT_MODE_INVALID:
 				return NULL;
 			default:
 				return &ts->imapaint.paint;
@@ -231,39 +231,39 @@ ePaintMode BKE_paintmode_get_active_from_context(const bContext *C)
 		if ((sima = CTX_wm_space_image(C)) != NULL) {
 			if (obact && obact->mode == OB_MODE_EDIT) {
 				if (sima->mode == SI_MODE_PAINT)
-					return ePaintTexture2D;
+					return PAINT_MODE_TEXTURE_2D;
 				else if (ts->use_uv_sculpt)
-					return ePaintSculptUV;
+					return PAINT_MODE_SCULPT_UV;
 			}
 			else {
-				return ePaintTexture2D;
+				return PAINT_MODE_TEXTURE_2D;
 			}
 		}
 		else if (obact) {
 			switch (obact->mode) {
 				case OB_MODE_SCULPT:
-					return ePaintSculpt;
+					return PAINT_MODE_SCULPT;
 				case OB_MODE_VERTEX_PAINT:
-					return ePaintVertex;
+					return PAINT_MODE_VERTEX;
 				case OB_MODE_WEIGHT_PAINT:
-					return ePaintWeight;
+					return PAINT_MODE_WEIGHT;
 				case OB_MODE_TEXTURE_PAINT:
-					return ePaintTexture3D;
+					return PAINT_MODE_TEXTURE_3D;
 				case OB_MODE_EDIT:
 					if (ts->use_uv_sculpt)
-						return ePaintSculptUV;
-					return ePaintTexture2D;
+						return PAINT_MODE_SCULPT_UV;
+					return PAINT_MODE_TEXTURE_2D;
 				default:
-					return ePaintTexture2D;
+					return PAINT_MODE_TEXTURE_2D;
 			}
 		}
 		else {
 			/* default to image paint */
-			return ePaintTexture2D;
+			return PAINT_MODE_TEXTURE_2D;
 		}
 	}
 
-	return ePaintInvalid;
+	return PAINT_MODE_INVALID;
 }
 
 Brush *BKE_paint_brush(Paint *p)
@@ -480,19 +480,19 @@ void BKE_paint_cavity_curve_preset(Paint *p, int preset)
 eObjectMode BKE_paint_object_mode_from_paint_mode(ePaintMode mode)
 {
 	switch (mode) {
-		case ePaintSculpt:
+		case PAINT_MODE_SCULPT:
 			return OB_MODE_SCULPT;
-		case ePaintVertex:
+		case PAINT_MODE_VERTEX:
 			return OB_MODE_VERTEX_PAINT;
-		case ePaintWeight:
+		case PAINT_MODE_WEIGHT:
 			return OB_MODE_WEIGHT_PAINT;
-		case ePaintTexture3D:
+		case PAINT_MODE_TEXTURE_3D:
 			return OB_MODE_TEXTURE_PAINT;
-		case ePaintTexture2D:
+		case PAINT_MODE_TEXTURE_2D:
 			return OB_MODE_TEXTURE_PAINT;
-		case ePaintSculptUV:
+		case PAINT_MODE_SCULPT_UV:
 			return OB_MODE_EDIT;
-		case ePaintInvalid:
+		case PAINT_MODE_INVALID:
 		default:
 			return 0;
 	}