Cleanup: naming for paint modes
- Rename ePaint* -> PAINT_MODE_*. - Use PAINT_OVERLAY_ prefix for eOverlayControlFlags.
This commit is contained in:
parent
c1d29ea783
commit
b97a2c3688
Notes:
blender-bot
2023-02-14 08:38:14 +01:00
Referenced by issue #57838, Rendering on gpu glitched, cpu works fine.
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 ePaintSculpt:
|
||||
case PAINT_MODE_SCULPT:
|
||||
name = "SCULPT_OT_brush_stroke";
|
||||
break;
|
||||
default:
|
||||
|
@ -698,7 +698,7 @@ static int paintcurve_cursor_invoke(bContext *C, wmOperator *UNUSED(op), const w
|
|||
ePaintMode mode = BKE_paintmode_get_active_from_context(C);
|
||||
|
||||
switch (mode) {
|
||||
case ePaintTexture2D:
|
||||
case PAINT_MODE_TEXTURE_2D:
|
||||
{
|
||||
ARegion *ar = CTX_wm_region(C);
|
||||
SpaceImage *sima = CTX_wm_space_image(C);
|
||||
|
|
|
@ -729,7 +729,7 @@ void ED_space_image_paint_update(Main *bmain, wmWindowManager *wm, Scene *scene)
|
|||
enabled = true;
|
||||
|
||||
if (enabled) {
|
||||
BKE_paint_init(bmain, scene, ePaintTexture2D, PAINT_CURSOR_TEXTURE_PAINT);
|
||||
BKE_paint_init(bmain, scene, PAINT_MODE_TEXTURE_2D, PAINT_CURSOR_TEXTURE_PAINT);
|
||||
|
||||
paint_cursor_start_explicit(&imapaint->paint, wm, image_paint_poll);
|
||||
}
|
||||
|
@ -878,7 +878,7 @@ static int sample_color_exec(bContext *C, wmOperator *op)
|
|||
|
||||
RNA_int_get_array(op->ptr, "location", location);
|
||||
const bool use_palette = RNA_boolean_get(op->ptr, "palette");
|
||||
const bool use_sample_texture = (mode == ePaintTexture3D) && !RNA_boolean_get(op->ptr, "merged");
|
||||
const bool use_sample_texture = (mode == PAINT_MODE_TEXTURE_3D) && !RNA_boolean_get(op->ptr, "merged");
|
||||
|
||||
paint_sample_color(C, ar, location[0], location[1], use_sample_texture, use_palette);
|
||||
|
||||
|
@ -918,7 +918,7 @@ static int sample_color_invoke(bContext *C, wmOperator *op, const wmEvent *event
|
|||
RNA_int_set_array(op->ptr, "location", event->mval);
|
||||
|
||||
ePaintMode mode = BKE_paintmode_get_active_from_context(C);
|
||||
const bool use_sample_texture = (mode == ePaintTexture3D) && !RNA_boolean_get(op->ptr, "merged");
|
||||
const bool use_sample_texture = (mode == PAINT_MODE_TEXTURE_3D) && !RNA_boolean_get(op->ptr, "merged");
|
||||
|
||||
paint_sample_color(C, ar, event->mval[0], event->mval[1], use_sample_texture, false);
|
||||
WM_cursor_modal_set(win, BC_EYEDROPPER_CURSOR);
|
||||
|
@ -954,7 +954,7 @@ static int sample_color_modal(bContext *C, wmOperator *op, const wmEvent *event)
|
|||
}
|
||||
|
||||
ePaintMode mode = BKE_paintmode_get_active_from_context(C);
|
||||
const bool use_sample_texture = (mode == ePaintTexture3D) && !RNA_boolean_get(op->ptr, "merged");
|
||||
const bool use_sample_texture = (mode == PAINT_MODE_TEXTURE_3D) && !RNA_boolean_get(op->ptr, "merged");
|
||||
|
||||
switch (event->type) {
|
||||
case MOUSEMOVE:
|
||||
|
@ -1093,7 +1093,7 @@ static int texture_paint_toggle_exec(bContext *C, wmOperator *op)
|
|||
|
||||
ob->mode |= mode_flag;
|
||||
|
||||
BKE_paint_init(bmain, scene, ePaintTexture3D, PAINT_CURSOR_TEXTURE_PAINT);
|
||||
BKE_paint_init(bmain, scene, PAINT_MODE_TEXTURE_3D, PAINT_CURSOR_TEXTURE_PAINT);
|
||||
|
||||
if (U.glreslimit != 0)
|
||||
GPU_free_images(bmain);
|
||||
|
|
|
@ -205,11 +205,11 @@ static int palette_color_add_exec(bContext *C, wmOperator *UNUSED(op))
|
|||
color = BKE_palette_color_add(palette);
|
||||
palette->active_color = BLI_listbase_count(&palette->colors) - 1;
|
||||
|
||||
if (ELEM(mode, ePaintTexture3D, ePaintTexture2D, ePaintVertex)) {
|
||||
if (ELEM(mode, PAINT_MODE_TEXTURE_3D, PAINT_MODE_TEXTURE_2D, PAINT_MODE_VERTEX)) {
|
||||
copy_v3_v3(color->rgb, BKE_brush_color_get(scene, brush));
|
||||
color->value = 0.0;
|
||||
}
|
||||
else if (mode == ePaintWeight) {
|
||||
else if (mode == PAINT_MODE_WEIGHT) {
|
||||
zero_v3(color->rgb);
|
||||
color->value = brush->weight;
|
||||
}
|
||||
|
|
|
@ -197,7 +197,7 @@ static void paint_draw_line_cursor(bContext *C, int x, int y, void *customdata)
|
|||
static bool paint_tool_require_location(Brush *brush, ePaintMode mode)
|
||||
{
|
||||
switch (mode) {
|
||||
case ePaintSculpt:
|
||||
case PAINT_MODE_SCULPT:
|
||||
if (ELEM(brush->sculpt_tool,
|
||||
SCULPT_TOOL_GRAB, SCULPT_TOOL_ROTATE,
|
||||
SCULPT_TOOL_SNAKE_HOOK, SCULPT_TOOL_THUMB))
|
||||
|
@ -426,7 +426,7 @@ static bool paint_stroke_use_jitter(ePaintMode mode, Brush *brush, bool invert)
|
|||
/* jitter-ed brush gives weird and unpredictable result for this
|
||||
* kinds of stroke, so manually disable jitter usage (sergey) */
|
||||
use_jitter &= (brush->flag & (BRUSH_DRAG_DOT | BRUSH_ANCHORED)) == 0;
|
||||
use_jitter &= (!ELEM(mode, ePaintTexture2D, ePaintTexture3D) ||
|
||||
use_jitter &= (!ELEM(mode, PAINT_MODE_TEXTURE_2D, PAINT_MODE_TEXTURE_3D) ||
|
||||
!(invert && brush->imagepaint_tool == PAINT_TOOL_CLONE));
|
||||
|
||||
|
||||
|
@ -819,13 +819,13 @@ bool paint_supports_dynamic_size(Brush *br, ePaintMode mode)
|
|||
return false;
|
||||
|
||||
switch (mode) {
|
||||
case ePaintSculpt:
|
||||
case PAINT_MODE_SCULPT:
|
||||
if (sculpt_is_grab_tool(br))
|
||||
return false;
|
||||
break;
|
||||
|
||||
case ePaintTexture2D: /* fall through */
|
||||
case ePaintTexture3D:
|
||||
case PAINT_MODE_TEXTURE_2D: /* fall through */
|
||||
case PAINT_MODE_TEXTURE_3D:
|
||||
if ((br->imagepaint_tool == PAINT_TOOL_FILL) &&
|
||||
(br->flag & BRUSH_USE_GRADIENT))
|
||||
{
|
||||
|
@ -848,7 +848,7 @@ bool paint_supports_smooth_stroke(Brush *br, ePaintMode mode)
|
|||
}
|
||||
|
||||
switch (mode) {
|
||||
case ePaintSculpt:
|
||||
case PAINT_MODE_SCULPT:
|
||||
if (sculpt_is_grab_tool(br))
|
||||
return false;
|
||||
break;
|
||||
|
@ -861,7 +861,7 @@ bool paint_supports_smooth_stroke(Brush *br, ePaintMode mode)
|
|||
bool paint_supports_texture(ePaintMode mode)
|
||||
{
|
||||
/* omit: PAINT_WEIGHT, PAINT_SCULPT_UV, PAINT_INVALID */
|
||||
return ELEM(mode, ePaintSculpt, ePaintVertex, ePaintTexture3D, ePaintTexture2D);
|
||||
return ELEM(mode, PAINT_MODE_SCULPT, PAINT_MODE_VERTEX, PAINT_MODE_TEXTURE_3D, PAINT_MODE_TEXTURE_2D);
|
||||
}
|
||||
|
||||
/* return true if the brush size can change during paint (normally used for pressure) */
|
||||
|
@ -871,7 +871,7 @@ bool paint_supports_dynamic_tex_coords(Brush *br, ePaintMode mode)
|
|||
return false;
|
||||
|
||||
switch (mode) {
|
||||
case ePaintSculpt:
|
||||
case PAINT_MODE_SCULPT:
|
||||
if (sculpt_is_grab_tool(br))
|
||||
return false;
|
||||
break;
|
||||
|
|
|
@ -1046,7 +1046,7 @@ static void ed_vwpaintmode_enter_generic(
|
|||
Mesh *me = BKE_mesh_from_object(ob);
|
||||
|
||||
if (mode_flag == OB_MODE_VERTEX_PAINT) {
|
||||
const ePaintMode paint_mode = ePaintVertex;
|
||||
const ePaintMode paint_mode = PAINT_MODE_VERTEX;
|
||||
ED_mesh_color_ensure(me, NULL);
|
||||
|
||||
if (scene->toolsettings->vpaint == NULL) {
|
||||
|
@ -1058,7 +1058,7 @@ static void ed_vwpaintmode_enter_generic(
|
|||
BKE_paint_init(bmain, scene, paint_mode, PAINT_CURSOR_VERTEX_PAINT);
|
||||
}
|
||||
else if (mode_flag == OB_MODE_WEIGHT_PAINT) {
|
||||
const ePaintMode paint_mode = ePaintWeight;
|
||||
const ePaintMode paint_mode = PAINT_MODE_WEIGHT;
|
||||
|
||||
if (scene->toolsettings->wpaint == NULL) {
|
||||
scene->toolsettings->wpaint = new_vpaint();
|
||||
|
@ -1363,7 +1363,7 @@ static void vwpaint_update_cache_variants(bContext *C, VPaint *vp, Object *ob, P
|
|||
* brush coord/pressure/etc.
|
||||
* It's more an events design issue, which doesn't split coordinate/pressure/angle
|
||||
* changing events. We should avoid this after events system re-design */
|
||||
if (paint_supports_dynamic_size(brush, ePaintSculpt) || cache->first_time) {
|
||||
if (paint_supports_dynamic_size(brush, PAINT_MODE_SCULPT) || cache->first_time) {
|
||||
cache->pressure = RNA_float_get(ptr, "pressure");
|
||||
}
|
||||
|
||||
|
@ -1379,7 +1379,7 @@ static void vwpaint_update_cache_variants(bContext *C, VPaint *vp, Object *ob, P
|
|||
}
|
||||
}
|
||||
|
||||
if (BKE_brush_use_size_pressure(scene, brush) && paint_supports_dynamic_size(brush, ePaintSculpt)) {
|
||||
if (BKE_brush_use_size_pressure(scene, brush) && paint_supports_dynamic_size(brush, PAINT_MODE_SCULPT)) {
|
||||
cache->radius = cache->initial_radius * cache->pressure;
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -4526,7 +4526,7 @@ static void sculpt_update_cache_variants(bContext *C, Sculpt *sd, Object *ob,
|
|||
* brush coord/pressure/etc.
|
||||
* It's more an events design issue, which doesn't split coordinate/pressure/angle
|
||||
* changing events. We should avoid this after events system re-design */
|
||||
if (paint_supports_dynamic_size(brush, ePaintSculpt) || cache->first_time) {
|
||||
if (paint_supports_dynamic_size(brush, PAINT_MODE_SCULPT) || cache->first_time) {
|
||||
cache->pressure = RNA_float_get(ptr, "pressure");
|
||||
}
|
||||
|
||||
|
@ -4543,7 +4543,7 @@ static void sculpt_update_cache_variants(bContext *C, Sculpt *sd, Object *ob,
|
|||
}
|
||||
}
|
||||
|
||||
if (BKE_brush_use_size_pressure(scene, brush) && paint_supports_dynamic_size(brush, ePaintSculpt)) {
|
||||
if (BKE_brush_use_size_pressure(scene, brush) && paint_supports_dynamic_size(brush, PAINT_MODE_SCULPT)) {
|
||||
cache->radius = cache->initial_radius * cache->pressure;
|
||||
}
|
||||
else {
|
||||
|
@ -5667,8 +5667,8 @@ void ED_object_sculptmode_enter_ex(
|
|||
"Object has negative scale, sculpting may be unpredictable");
|
||||
}
|
||||
|
||||
Paint *paint = BKE_paint_get_active_from_paintmode(scene, ePaintSculpt);
|
||||
BKE_paint_init(bmain, scene, ePaintSculpt, PAINT_CURSOR_SCULPT);
|
||||
Paint *paint = BKE_paint_get_active_from_paintmode(scene, PAINT_MODE_SCULPT);
|
||||
BKE_paint_init(bmain, scene, PAINT_MODE_SCULPT, PAINT_CURSOR_SCULPT);
|
||||
|
||||
paint_cursor_start_explicit(paint, bmain->wm.first, sculpt_poll_view3d);
|
||||
|
||||
|
|
|
@ -244,7 +244,7 @@ void ED_space_image_uv_sculpt_update(Main *bmain, wmWindowManager *wm, Scene *sc
|
|||
settings->uvsculpt->paint.flags |= PAINT_SHOW_BRUSH;
|
||||
}
|
||||
|
||||
BKE_paint_init(bmain, scene, ePaintSculptUV, PAINT_CURSOR_SCULPT);
|
||||
BKE_paint_init(bmain, scene, PAINT_MODE_SCULPT_UV, PAINT_CURSOR_SCULPT);
|
||||
|
||||
settings->uvsculpt->paint.paint_cursor = WM_paint_cursor_activate(
|
||||
wm, uv_sculpt_brush_poll,
|
||||
|
|
|
@ -526,7 +526,7 @@ static const EnumPropertyItem *rna_Brush_direction_itemf(bContext *C, PointerRNA
|
|||
Brush *me = (Brush *)(ptr->data);
|
||||
|
||||
switch (mode) {
|
||||
case ePaintSculpt:
|
||||
case PAINT_MODE_SCULPT:
|
||||
switch (me->sculpt_tool) {
|
||||
case SCULPT_TOOL_DRAW:
|
||||
case SCULPT_TOOL_CREASE:
|
||||
|
@ -567,8 +567,8 @@ static const EnumPropertyItem *rna_Brush_direction_itemf(bContext *C, PointerRNA
|
|||
return prop_default_items;
|
||||
}
|
||||
|
||||
case ePaintTexture2D:
|
||||
case ePaintTexture3D:
|
||||
case PAINT_MODE_TEXTURE_2D:
|
||||
case PAINT_MODE_TEXTURE_3D:
|
||||
switch (me->imagepaint_tool) {
|
||||
case PAINT_TOOL_SOFTEN:
|
||||
return prop_soften_sharpen_items;
|
||||
|
@ -597,9 +597,9 @@ static const EnumPropertyItem *rna_Brush_stroke_itemf(bContext *C, PointerRNA *U
|
|||
};
|
||||
|
||||
switch (mode) {
|
||||
case ePaintSculpt:
|
||||
case ePaintTexture2D:
|
||||
case ePaintTexture3D:
|
||||
case PAINT_MODE_SCULPT:
|
||||
case PAINT_MODE_TEXTURE_2D:
|
||||
case PAINT_MODE_TEXTURE_3D:
|
||||
return sculpt_stroke_method_items;
|
||||
|
||||
default:
|
||||
|
|
Loading…
Reference in New Issue