[Bf-blender-cvs] [b97a2c3688a] master: Cleanup: naming for paint modes
Campbell Barton
noreply at git.blender.org
Wed Nov 14 01:22:41 CET 2018
Commit: b97a2c3688ad29b051898ff2be5f9b9e98bebdba
Author: Campbell Barton
Date: Wed Nov 14 11:20:08 2018 +1100
Branches: master
https://developer.blender.org/rBb97a2c3688ad29b051898ff2be5f9b9e98bebdba
Cleanup: naming for paint modes
- Rename ePaint* -> PAINT_MODE_*.
- Use PAINT_OVERLAY_ prefix for eOverlayControlFlags.
===================================================================
M source/blender/blenkernel/BKE_paint.h
M source/blender/blenkernel/intern/paint.c
M source/blender/editors/sculpt_paint/paint_cursor.c
M source/blender/editors/sculpt_paint/paint_curve.c
M source/blender/editors/sculpt_paint/paint_image.c
M source/blender/editors/sculpt_paint/paint_ops.c
M source/blender/editors/sculpt_paint/paint_stroke.c
M source/blender/editors/sculpt_paint/paint_vertex.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/sculpt_paint/sculpt_uv.c
M source/blender/makesrna/intern/rna_brush.c
===================================================================
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;
}
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c
index fb938ed60c9..90066a20e88 100644
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@ -259,8 +259,8 @@ static int load_tex(Brush *br, ViewContext *vc, float zoom, bool col, bool prima
bool refresh;
eOverlayControlFlags invalid = (
(primary) ?
- (overlay_flags & PAINT_INVALID_OVERLAY_TEXTURE_PRIMARY) :
- (overlay_flags & PAINT_INVALID_OVERLAY_TEXTURE_SECONDARY));
+ (overlay_flags & PAINT_OVERLAY_INVALID_TEXTURE_PRIMARY) :
+ (overlay_flags & PAINT_OVERLAY_INVALID_TEXTURE_SECONDARY));
target = (primary) ? &primary_snap : &secondary_snap;
refresh =
@@ -414,7 +414,7 @@ static int load_tex_cursor(Brush *br, ViewContext *vc, float zoom)
int size;
const bool refresh =
!cursor_snap.overlay_texture ||
- (overlay_flags & PAINT_INVALID_OVERLAY_CURVE) ||
+ (overlay_flags & PAINT_OVERLAY_INVALID_CURVE) ||
cursor_snap.zoom != zoom;
init = (cursor_snap.overlay_texture != 0);
@@ -489,7 +489,7 @@ static int load_tex_cursor(Brush *br, ViewContext *vc, float zoom)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
- BKE_paint_reset_overlay_invalid(PAINT_INVALID_OVERLAY_CURVE);
+ BKE_paint_reset_overlay_invalid(PAINT_OVERLAY_INVALID_CURVE);
return 1;
}
@@ -788,7 +788,7 @@ static void paint_draw_alpha_overlay(
ViewContext *vc, int x, int y, float zoom, ePaintMode mode)
{
/* color means that primary brush texture is colured and secondary is used for alpha/mask control */
- bool col = ELEM(mode, ePaintTexture3D, ePaintTexture2D, ePaintVertex) ? true : false;
+ bool col = ELEM(mode, PAINT_MODE_TEXTURE_3D, PAINT_MODE_TEXTURE_2D, PAINT_MODE_VERTEX) ? true : false;
eOverlayControlFlags flags = BKE_paint_get_overlay_flags();
/* save lots of GL state
* TODO: check on whether all of these are needed? */
@@ -814,7 +814,7 @@ static void paint_draw_alpha_overlay(
paint_draw_cursor_overlay(ups, brush, vc, x, y, zoom);
}
else {
- if (!(flags & PAINT_OVERLAY_OVERRIDE_PRIMARY) && (mode != ePaintWeight))
+ if (!(flags & PAINT_OVERLAY_OVERRIDE_PRIMARY) && (mode != PAINT_MODE_WEIGHT))
paint_draw_tex_overlay(ups, brush, vc, x, y, zoom, false, true);
if (!(flags & PAINT_OVERLAY_OVERRIDE_CURSOR))
paint_draw_cursor_overlay(ups, brush, vc, x, y, zoom);
@@ -990,7 +990,7 @@ static void paint_cursor_on_hit(
static bool ommit_cursor_drawing(Paint *paint, ePaintMode mode, Brush *brush)
{
if (paint->flags & PAINT_SHOW_BRUSH) {
- if (ELEM(mode, ePaintTexture2D, ePaintTexture3D) && brush->imagepaint_tool == PAINT_TOOL_FILL) {
+ if (ELEM(mode, PAINT_MODE_TEXTURE_2D, PAINT_MODE_TEXTURE_3D) && brush->imagepaint_tool == PAINT_TOOL_FILL) {
return true;
}
return false;
@@ -1050,7 +1050,7 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused))
/* TODO: as sculpt and other paint modes are unified, this
* special mode of drawing will go away */
- if ((mode == ePaintSculpt) && vc.obact->sculpt) {
+ if ((mode == PAINT_MODE_SCULPT) && vc.obact->sculpt) {
float location[3];
int pixel_radius;
bool hit;
diff --git a/source/blender/editors/sculpt_paint/paint_curve.c b/source/blender/editors/sculpt_paint/paint_curve.c
index 1bbc1a7a555..55912733dc2 100644
--- a/source/blender/editors/sculpt_paint/paint_curve.c
+++ b/source/blender/editors/sculpt_paint/paint_curve.c
@@ -658,17 +658,17 @@ static int paintcurve_draw_exec(bContext *C, wmOperator *UNUSED(op))
const char *name;
switch (mode) {
- case ePaintTexture2D:
- case ePaintTexture3D:
+ case PAINT_MODE_TEXTURE_2D:
+ case PAINT_MODE_TEXTURE_3D:
name = "PAINT_OT_image_paint";
break;
- case ePaintWeight:
+ case PAINT_MODE_WEIGHT:
name = "PAINT_OT_weight_paint";
break;
- case ePaintVertex:
+ case PAINT_MODE_VERTEX:
name = "PAINT_OT_vertex_paint";
break;
- case ePa
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list