diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h index 468e7a0b33d..07c20965204 100644 --- a/source/blender/blenkernel/BKE_context.h +++ b/source/blender/blenkernel/BKE_context.h @@ -127,11 +127,11 @@ typedef enum eContextObjectMode { CTX_MODE_PAINT_TEXTURE, CTX_MODE_PARTICLE, CTX_MODE_OBJECT, - CTX_MODE_PAINT_GPENCIL, + CTX_MODE_PAINT_GPENCIL_LEGACY, CTX_MODE_EDIT_GPENCIL_LEGACY, - CTX_MODE_SCULPT_GPENCIL, - CTX_MODE_WEIGHT_GPENCIL, - CTX_MODE_VERTEX_GPENCIL, + CTX_MODE_SCULPT_GPENCIL_LEGACY, + CTX_MODE_WEIGHT_GPENCIL_LEGACY, + CTX_MODE_VERTEX_GPENCIL_LEGACY, CTX_MODE_SCULPT_CURVES, } eContextObjectMode; #define CTX_MODE_NUM (CTX_MODE_SCULPT_CURVES + 1) diff --git a/source/blender/blenkernel/intern/brush.cc b/source/blender/blenkernel/intern/brush.cc index 4ea00dca440..c4e2456652a 100644 --- a/source/blender/blenkernel/intern/brush.cc +++ b/source/blender/blenkernel/intern/brush.cc @@ -579,19 +579,19 @@ Brush *BKE_brush_add_gpencil(Main *bmain, ToolSettings *ts, const char *name, eO Paint *paint = nullptr; Brush *brush; switch (mode) { - case OB_MODE_PAINT_GPENCIL: { + case OB_MODE_PAINT_GPENCIL_LEGACY: { paint = &ts->gp_paint->paint; break; } - case OB_MODE_SCULPT_GPENCIL: { + case OB_MODE_SCULPT_GPENCIL_LEGACY: { paint = &ts->gp_sculptpaint->paint; break; } - case OB_MODE_WEIGHT_GPENCIL: { + case OB_MODE_WEIGHT_GPENCIL_LEGACY: { paint = &ts->gp_weightpaint->paint; break; } - case OB_MODE_VERTEX_GPENCIL: { + case OB_MODE_VERTEX_GPENCIL_LEGACY: { paint = &ts->gp_vertexpaint->paint; break; } @@ -1398,86 +1398,86 @@ void BKE_brush_gpencil_paint_presets(Main *bmain, ToolSettings *ts, const bool r Brush *brush_prev = paint->brush; Brush *brush, *deft_draw; /* Airbrush brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Airbrush", OB_MODE_PAINT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Airbrush", OB_MODE_PAINT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_AIRBRUSH); } /* Ink Pen brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Ink Pen", OB_MODE_PAINT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Ink Pen", OB_MODE_PAINT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_INK_PEN); } /* Ink Pen Rough brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Ink Pen Rough", OB_MODE_PAINT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Ink Pen Rough", OB_MODE_PAINT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_INK_PEN_ROUGH); } /* Marker Bold brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Marker Bold", OB_MODE_PAINT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Marker Bold", OB_MODE_PAINT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_MARKER_BOLD); } /* Marker Chisel brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Marker Chisel", OB_MODE_PAINT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Marker Chisel", OB_MODE_PAINT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_MARKER_CHISEL); } /* Pen brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Pen", OB_MODE_PAINT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Pen", OB_MODE_PAINT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_PEN); } /* Pencil Soft brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Pencil Soft", OB_MODE_PAINT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Pencil Soft", OB_MODE_PAINT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_PENCIL_SOFT); } /* Pencil brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Pencil", OB_MODE_PAINT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Pencil", OB_MODE_PAINT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_PENCIL); } deft_draw = brush; /* save default brush. */ /* Fill brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Fill Area", OB_MODE_PAINT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Fill Area", OB_MODE_PAINT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_FILL_AREA); } /* Soft Eraser brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Eraser Soft", OB_MODE_PAINT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Eraser Soft", OB_MODE_PAINT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_ERASER_SOFT); } /* Hard Eraser brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Eraser Hard", OB_MODE_PAINT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Eraser Hard", OB_MODE_PAINT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_ERASER_HARD); } /* Point Eraser brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Eraser Point", OB_MODE_PAINT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Eraser Point", OB_MODE_PAINT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_ERASER_POINT); } /* Stroke Eraser brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Eraser Stroke", OB_MODE_PAINT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Eraser Stroke", OB_MODE_PAINT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_ERASER_STROKE); } /* Tint brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Tint", OB_MODE_PAINT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Tint", OB_MODE_PAINT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_TINT); } @@ -1499,29 +1499,29 @@ void BKE_brush_gpencil_vertex_presets(Main *bmain, ToolSettings *ts, const bool Brush *brush_prev = vertexpaint->brush; Brush *brush, *deft_vertex; /* Vertex Draw brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Vertex Draw", OB_MODE_VERTEX_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Vertex Draw", OB_MODE_VERTEX_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_VERTEX_DRAW); } deft_vertex = brush; /* save default brush. */ /* Vertex Blur brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Vertex Blur", OB_MODE_VERTEX_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Vertex Blur", OB_MODE_VERTEX_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_VERTEX_BLUR); } /* Vertex Average brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Vertex Average", OB_MODE_VERTEX_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Vertex Average", OB_MODE_VERTEX_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_VERTEX_AVERAGE); } /* Vertex Smear brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Vertex Smear", OB_MODE_VERTEX_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Vertex Smear", OB_MODE_VERTEX_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_VERTEX_SMEAR); } /* Vertex Replace brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Vertex Replace", OB_MODE_VERTEX_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Vertex Replace", OB_MODE_VERTEX_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_VERTEX_REPLACE); } @@ -1546,56 +1546,59 @@ void BKE_brush_gpencil_sculpt_presets(Main *bmain, ToolSettings *ts, const bool Brush *brush, *deft_sculpt; /* Smooth brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Smooth Stroke", OB_MODE_SCULPT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Smooth Stroke", OB_MODE_SCULPT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_SMOOTH_STROKE); } deft_sculpt = brush; /* Strength brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Strength Stroke", OB_MODE_SCULPT_GPENCIL, &r_new); + brush = gpencil_brush_ensure( + bmain, ts, "Strength Stroke", OB_MODE_SCULPT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_STRENGTH_STROKE); } /* Thickness brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Thickness Stroke", OB_MODE_SCULPT_GPENCIL, &r_new); + brush = gpencil_brush_ensure( + bmain, ts, "Thickness Stroke", OB_MODE_SCULPT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_THICKNESS_STROKE); } /* Grab brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Grab Stroke", OB_MODE_SCULPT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Grab Stroke", OB_MODE_SCULPT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_GRAB_STROKE); } /* Push brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Push Stroke", OB_MODE_SCULPT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Push Stroke", OB_MODE_SCULPT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_PUSH_STROKE); } /* Twist brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Twist Stroke", OB_MODE_SCULPT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Twist Stroke", OB_MODE_SCULPT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_TWIST_STROKE); } /* Pinch brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Pinch Stroke", OB_MODE_SCULPT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Pinch Stroke", OB_MODE_SCULPT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_PINCH_STROKE); } /* Randomize brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Randomize Stroke", OB_MODE_SCULPT_GPENCIL, &r_new); + brush = gpencil_brush_ensure( + bmain, ts, "Randomize Stroke", OB_MODE_SCULPT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_RANDOMIZE_STROKE); } /* Clone brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Clone Stroke", OB_MODE_SCULPT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Clone Stroke", OB_MODE_SCULPT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_CLONE_STROKE); } @@ -1620,26 +1623,26 @@ void BKE_brush_gpencil_weight_presets(Main *bmain, ToolSettings *ts, const bool Brush *brush, *deft_weight; /* Weight Draw brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Weight Draw", OB_MODE_WEIGHT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Weight Draw", OB_MODE_WEIGHT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_WEIGHT_DRAW); } deft_weight = brush; /* save default brush. */ /* Weight Blur brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Weight Blur", OB_MODE_WEIGHT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Weight Blur", OB_MODE_WEIGHT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_WEIGHT_BLUR); } /* Weight Average brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Weight Average", OB_MODE_WEIGHT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Weight Average", OB_MODE_WEIGHT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_WEIGHT_AVERAGE); } /* Weight Smear brush. */ - brush = gpencil_brush_ensure(bmain, ts, "Weight Smear", OB_MODE_WEIGHT_GPENCIL, &r_new); + brush = gpencil_brush_ensure(bmain, ts, "Weight Smear", OB_MODE_WEIGHT_GPENCIL_LEGACY, &r_new); if ((reset) || (r_new)) { BKE_gpencil_brush_preset_set(bmain, brush, GP_BRUSH_PRESET_WEIGHT_SMEAR); } diff --git a/source/blender/blenkernel/intern/context.cc b/source/blender/blenkernel/intern/context.cc index 8dca8023148..7480216f7f8 100644 --- a/source/blender/blenkernel/intern/context.cc +++ b/source/blender/blenkernel/intern/context.cc @@ -1213,20 +1213,20 @@ enum eContextObjectMode CTX_data_mode_enum_ex(const Object *obedit, if (object_mode & OB_MODE_PARTICLE_EDIT) { return CTX_MODE_PARTICLE; } - if (object_mode & OB_MODE_PAINT_GPENCIL) { - return CTX_MODE_PAINT_GPENCIL; + if (object_mode & OB_MODE_PAINT_GPENCIL_LEGACY) { + return CTX_MODE_PAINT_GPENCIL_LEGACY; } - if (object_mode & OB_MODE_EDIT_GPENCIL) { + if (object_mode & OB_MODE_EDIT_GPENCIL_LEGACY) { return CTX_MODE_EDIT_GPENCIL_LEGACY; } - if (object_mode & OB_MODE_SCULPT_GPENCIL) { - return CTX_MODE_SCULPT_GPENCIL; + if (object_mode & OB_MODE_SCULPT_GPENCIL_LEGACY) { + return CTX_MODE_SCULPT_GPENCIL_LEGACY; } - if (object_mode & OB_MODE_WEIGHT_GPENCIL) { - return CTX_MODE_WEIGHT_GPENCIL; + if (object_mode & OB_MODE_WEIGHT_GPENCIL_LEGACY) { + return CTX_MODE_WEIGHT_GPENCIL_LEGACY; } - if (object_mode & OB_MODE_VERTEX_GPENCIL) { - return CTX_MODE_VERTEX_GPENCIL; + if (object_mode & OB_MODE_VERTEX_GPENCIL_LEGACY) { + return CTX_MODE_VERTEX_GPENCIL_LEGACY; } if (object_mode & OB_MODE_SCULPT_CURVES) { return CTX_MODE_SCULPT_CURVES; diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index 5f17178cd0f..41fb2ad4abd 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -2623,7 +2623,7 @@ Object *BKE_object_pose_armature_get_with_wpaint_check(Object *ob) break; } case OB_GPENCIL_LEGACY: { - if ((ob->mode & OB_MODE_WEIGHT_GPENCIL) == 0) { + if ((ob->mode & OB_MODE_WEIGHT_GPENCIL_LEGACY) == 0) { return nullptr; } break; diff --git a/source/blender/blenkernel/intern/paint.cc b/source/blender/blenkernel/intern/paint.cc index 08fdd97d961..ed1f9ae936f 100644 --- a/source/blender/blenkernel/intern/paint.cc +++ b/source/blender/blenkernel/intern/paint.cc @@ -498,13 +498,13 @@ Paint *BKE_paint_get_active(Scene *sce, ViewLayer *view_layer) return &ts->wpaint->paint; case OB_MODE_TEXTURE_PAINT: return &ts->imapaint.paint; - case OB_MODE_PAINT_GPENCIL: + case OB_MODE_PAINT_GPENCIL_LEGACY: return &ts->gp_paint->paint; - case OB_MODE_VERTEX_GPENCIL: + case OB_MODE_VERTEX_GPENCIL_LEGACY: return &ts->gp_vertexpaint->paint; - case OB_MODE_SCULPT_GPENCIL: + case OB_MODE_SCULPT_GPENCIL_LEGACY: return &ts->gp_sculptpaint->paint; - case OB_MODE_WEIGHT_GPENCIL: + case OB_MODE_WEIGHT_GPENCIL_LEGACY: return &ts->gp_weightpaint->paint; case OB_MODE_SCULPT_CURVES: return &ts->curves_sculpt->paint; @@ -614,15 +614,15 @@ ePaintMode BKE_paintmode_get_from_tool(const bToolRef *tref) return PAINT_MODE_VERTEX; case CTX_MODE_PAINT_WEIGHT: return PAINT_MODE_WEIGHT; - case CTX_MODE_PAINT_GPENCIL: + case CTX_MODE_PAINT_GPENCIL_LEGACY: return PAINT_MODE_GPENCIL; case CTX_MODE_PAINT_TEXTURE: return PAINT_MODE_TEXTURE_3D; - case CTX_MODE_VERTEX_GPENCIL: + case CTX_MODE_VERTEX_GPENCIL_LEGACY: return PAINT_MODE_VERTEX_GPENCIL; - case CTX_MODE_SCULPT_GPENCIL: + case CTX_MODE_SCULPT_GPENCIL_LEGACY: return PAINT_MODE_SCULPT_GPENCIL; - case CTX_MODE_WEIGHT_GPENCIL: + case CTX_MODE_WEIGHT_GPENCIL_LEGACY: return PAINT_MODE_WEIGHT_GPENCIL; case CTX_MODE_SCULPT_CURVES: return PAINT_MODE_SCULPT_CURVES; @@ -685,19 +685,19 @@ void BKE_paint_runtime_init(const ToolSettings *ts, Paint *paint) } else if (ts->gp_paint && paint == &ts->gp_paint->paint) { paint->runtime.tool_offset = offsetof(Brush, gpencil_tool); - paint->runtime.ob_mode = OB_MODE_PAINT_GPENCIL; + paint->runtime.ob_mode = OB_MODE_PAINT_GPENCIL_LEGACY; } else if (ts->gp_vertexpaint && paint == &ts->gp_vertexpaint->paint) { paint->runtime.tool_offset = offsetof(Brush, gpencil_vertex_tool); - paint->runtime.ob_mode = OB_MODE_VERTEX_GPENCIL; + paint->runtime.ob_mode = OB_MODE_VERTEX_GPENCIL_LEGACY; } else if (ts->gp_sculptpaint && paint == &ts->gp_sculptpaint->paint) { paint->runtime.tool_offset = offsetof(Brush, gpencil_sculpt_tool); - paint->runtime.ob_mode = OB_MODE_SCULPT_GPENCIL; + paint->runtime.ob_mode = OB_MODE_SCULPT_GPENCIL_LEGACY; } else if (ts->gp_weightpaint && paint == &ts->gp_weightpaint->paint) { paint->runtime.tool_offset = offsetof(Brush, gpencil_weight_tool); - paint->runtime.ob_mode = OB_MODE_WEIGHT_GPENCIL; + paint->runtime.ob_mode = OB_MODE_WEIGHT_GPENCIL_LEGACY; } else if (ts->curves_sculpt && paint == &ts->curves_sculpt->paint) { paint->runtime.tool_offset = offsetof(Brush, curves_sculpt_tool); diff --git a/source/blender/blenloader/intern/versioning_defaults.cc b/source/blender/blenloader/intern/versioning_defaults.cc index 7b1cc3cb7bb..34fe4db71f4 100644 --- a/source/blender/blenloader/intern/versioning_defaults.cc +++ b/source/blender/blenloader/intern/versioning_defaults.cc @@ -264,7 +264,7 @@ void BLO_update_defaults_workspace(WorkSpace *workspace, const char *app_templat /* For 2D animation template. */ if (STREQ(workspace->id.name + 2, "Drawing")) { - workspace->object_mode = OB_MODE_PAINT_GPENCIL; + workspace->object_mode = OB_MODE_PAINT_GPENCIL_LEGACY; } /* For Sculpting template. */ @@ -555,7 +555,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template) if (object->type == OB_GPENCIL_LEGACY) { /* Set grease pencil object in drawing mode */ bGPdata *gpd = (bGPdata *)object->data; - object->mode = OB_MODE_PAINT_GPENCIL; + object->mode = OB_MODE_PAINT_GPENCIL_LEGACY; gpd->flag |= GP_DATA_STROKE_PAINTMODE; break; } diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c index 0b3792f3a50..93a5d581ba1 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.c +++ b/source/blender/draw/engines/gpencil/gpencil_engine.c @@ -113,7 +113,7 @@ void GPENCIL_engine_init(void *ved) stl->pd->v3d_color_type = (v3d->shading.type == OB_SOLID) ? v3d->shading.color_type : -1; /* Special case: If Vertex Paint mode, use always Vertex mode. */ if (v3d->shading.type == OB_SOLID && ctx->obact && ctx->obact->type == OB_GPENCIL_LEGACY && - ctx->obact->mode == OB_MODE_VERTEX_GPENCIL) + ctx->obact->mode == OB_MODE_VERTEX_GPENCIL_LEGACY) { stl->pd->v3d_color_type = V3D_SHADING_VERTEX_COLOR; } diff --git a/source/blender/draw/engines/overlay/overlay_engine.cc b/source/blender/draw/engines/overlay/overlay_engine.cc index e9e8bd65637..6e10e7f6103 100644 --- a/source/blender/draw/engines/overlay/overlay_engine.cc +++ b/source/blender/draw/engines/overlay/overlay_engine.cc @@ -199,10 +199,10 @@ static void OVERLAY_cache_init(void *vedata) case CTX_MODE_EDIT_GPENCIL_LEGACY: OVERLAY_edit_gpencil_legacy_cache_init(data); break; - case CTX_MODE_PAINT_GPENCIL: - case CTX_MODE_SCULPT_GPENCIL: - case CTX_MODE_VERTEX_GPENCIL: - case CTX_MODE_WEIGHT_GPENCIL: + case CTX_MODE_PAINT_GPENCIL_LEGACY: + case CTX_MODE_SCULPT_GPENCIL_LEGACY: + case CTX_MODE_VERTEX_GPENCIL_LEGACY: + case CTX_MODE_WEIGHT_GPENCIL_LEGACY: OVERLAY_edit_gpencil_legacy_cache_init(data); break; case CTX_MODE_EDIT_CURVES: @@ -733,10 +733,10 @@ static void OVERLAY_draw_scene(void *vedata) case CTX_MODE_EDIT_GPENCIL_LEGACY: OVERLAY_edit_gpencil_legacy_draw(data); break; - case CTX_MODE_PAINT_GPENCIL: - case CTX_MODE_SCULPT_GPENCIL: - case CTX_MODE_VERTEX_GPENCIL: - case CTX_MODE_WEIGHT_GPENCIL: + case CTX_MODE_PAINT_GPENCIL_LEGACY: + case CTX_MODE_SCULPT_GPENCIL_LEGACY: + case CTX_MODE_VERTEX_GPENCIL_LEGACY: + case CTX_MODE_WEIGHT_GPENCIL_LEGACY: OVERLAY_edit_gpencil_legacy_draw(data); break; case CTX_MODE_SCULPT_CURVES: diff --git a/source/blender/draw/engines/overlay/overlay_gpencil_legacy.cc b/source/blender/draw/engines/overlay/overlay_gpencil_legacy.cc index 7377f46a015..d436cf551e5 100644 --- a/source/blender/draw/engines/overlay/overlay_gpencil_legacy.cc +++ b/source/blender/draw/engines/overlay/overlay_gpencil_legacy.cc @@ -160,7 +160,7 @@ void OVERLAY_edit_gpencil_legacy_cache_init(OVERLAY_Data *vedata) /* control points for primitives and speed guide */ const bool is_cppoint = (gpd->runtime.tot_cp_points > 0); const bool is_speed_guide = (ts->gp_sculpt.guide.use_guide && - (draw_ctx->object_mode == OB_MODE_PAINT_GPENCIL)); + (draw_ctx->object_mode == OB_MODE_PAINT_GPENCIL_LEGACY)); const bool is_show_gizmo = (((v3d->gizmo_flag & V3D_GIZMO_HIDE) == 0) && ((v3d->gizmo_flag & V3D_GIZMO_HIDE_TOOL) == 0)); @@ -442,7 +442,7 @@ void OVERLAY_gpencil_legacy_cache_populate(OVERLAY_Data *vedata, Object *ob) /* don't show object extras in set's */ if ((ob->base_flag & (BASE_FROM_SET | BASE_FROM_DUPLI)) == 0) { - if ((v3d->gp_flag & V3D_GP_SHOW_MATERIAL_NAME) && (ob->mode == OB_MODE_EDIT_GPENCIL) && + if ((v3d->gp_flag & V3D_GP_SHOW_MATERIAL_NAME) && (ob->mode == OB_MODE_EDIT_GPENCIL_LEGACY) && DRW_state_show_text()) { OVERLAY_gpencil_color_names(ob); diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c index 2722d199005..6cbf562588c 100644 --- a/source/blender/draw/intern/draw_view.c +++ b/source/blender/draw/intern/draw_view.c @@ -81,7 +81,7 @@ static bool is_cursor_visible(const DRWContextState *draw_ctx, Scene *scene, Vie /* no exception met? then don't draw cursor! */ return false; } - if (draw_ctx->object_mode & OB_MODE_WEIGHT_GPENCIL) { + if (draw_ctx->object_mode & OB_MODE_WEIGHT_GPENCIL_LEGACY) { /* grease pencil hide always in some modes */ return false; } diff --git a/source/blender/editors/gpencil_legacy/gpencil_data.c b/source/blender/editors/gpencil_legacy/gpencil_data.c index 6f8d3e61e28..c151bb92d40 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_data.c +++ b/source/blender/editors/gpencil_legacy/gpencil_data.c @@ -1954,7 +1954,7 @@ static int gpencil_brush_reset_exec(bContext *C, wmOperator *UNUSED(op)) Brush *brush = NULL; switch (mode) { - case CTX_MODE_PAINT_GPENCIL: { + case CTX_MODE_PAINT_GPENCIL_LEGACY: { Paint *paint = &ts->gp_paint->paint; brush = paint->brush; if (brush && brush->gpencil_settings) { @@ -1962,7 +1962,7 @@ static int gpencil_brush_reset_exec(bContext *C, wmOperator *UNUSED(op)) } break; } - case CTX_MODE_SCULPT_GPENCIL: { + case CTX_MODE_SCULPT_GPENCIL_LEGACY: { Paint *paint = &ts->gp_sculptpaint->paint; brush = paint->brush; if (brush && brush->gpencil_settings) { @@ -1970,7 +1970,7 @@ static int gpencil_brush_reset_exec(bContext *C, wmOperator *UNUSED(op)) } break; } - case CTX_MODE_WEIGHT_GPENCIL: { + case CTX_MODE_WEIGHT_GPENCIL_LEGACY: { Paint *paint = &ts->gp_weightpaint->paint; brush = paint->brush; if (brush && brush->gpencil_settings) { @@ -1978,7 +1978,7 @@ static int gpencil_brush_reset_exec(bContext *C, wmOperator *UNUSED(op)) } break; } - case CTX_MODE_VERTEX_GPENCIL: { + case CTX_MODE_VERTEX_GPENCIL_LEGACY: { Paint *paint = &ts->gp_vertexpaint->paint; brush = paint->brush; if (brush && brush->gpencil_settings) { @@ -2023,19 +2023,19 @@ static Brush *gpencil_brush_get_first_by_mode(Main *bmain, continue; } - if ((mode == CTX_MODE_PAINT_GPENCIL) && (brush->gpencil_tool == tool)) { + if ((mode == CTX_MODE_PAINT_GPENCIL_LEGACY) && (brush->gpencil_tool == tool)) { return brush; } - if ((mode == CTX_MODE_SCULPT_GPENCIL) && (brush->gpencil_sculpt_tool == tool)) { + if ((mode == CTX_MODE_SCULPT_GPENCIL_LEGACY) && (brush->gpencil_sculpt_tool == tool)) { return brush; } - if ((mode == CTX_MODE_WEIGHT_GPENCIL) && (brush->gpencil_weight_tool == tool)) { + if ((mode == CTX_MODE_WEIGHT_GPENCIL_LEGACY) && (brush->gpencil_weight_tool == tool)) { return brush; } - if ((mode == CTX_MODE_VERTEX_GPENCIL) && (brush->gpencil_vertex_tool == tool)) { + if ((mode == CTX_MODE_VERTEX_GPENCIL_LEGACY) && (brush->gpencil_vertex_tool == tool)) { return brush; } } @@ -2052,7 +2052,7 @@ static void gpencil_brush_delete_mode_brushes(Main *bmain, for (Brush *brush = bmain->brushes.first; brush; brush = brush_next) { brush_next = brush->id.next; - if ((brush->gpencil_settings == NULL) && (brush->ob_mode != OB_MODE_PAINT_GPENCIL)) { + if ((brush->gpencil_settings == NULL) && (brush->ob_mode != OB_MODE_PAINT_GPENCIL_LEGACY)) { continue; } @@ -2061,7 +2061,7 @@ static void gpencil_brush_delete_mode_brushes(Main *bmain, if (preset != GP_BRUSH_PRESET_UNKNOWN) { /* Verify to delete only the brushes of the current mode. */ - if (mode == CTX_MODE_PAINT_GPENCIL) { + if (mode == CTX_MODE_PAINT_GPENCIL_LEGACY) { if ((preset < GP_BRUSH_PRESET_AIRBRUSH) || (preset > GP_BRUSH_PRESET_TINT)) { continue; } @@ -2070,7 +2070,7 @@ static void gpencil_brush_delete_mode_brushes(Main *bmain, } } - if (mode == CTX_MODE_SCULPT_GPENCIL) { + if (mode == CTX_MODE_SCULPT_GPENCIL_LEGACY) { if ((preset < GP_BRUSH_PRESET_SMOOTH_STROKE) || (preset > GP_BRUSH_PRESET_CLONE_STROKE)) { continue; } @@ -2079,7 +2079,7 @@ static void gpencil_brush_delete_mode_brushes(Main *bmain, } } - if (mode == CTX_MODE_WEIGHT_GPENCIL) { + if (mode == CTX_MODE_WEIGHT_GPENCIL_LEGACY) { if ((preset < GP_BRUSH_PRESET_WEIGHT_DRAW) || (preset > GP_BRUSH_PRESET_WEIGHT_SMEAR)) { continue; } @@ -2088,7 +2088,7 @@ static void gpencil_brush_delete_mode_brushes(Main *bmain, } } - if (mode == CTX_MODE_VERTEX_GPENCIL) { + if (mode == CTX_MODE_VERTEX_GPENCIL_LEGACY) { if ((preset < GP_BRUSH_PRESET_VERTEX_DRAW) || (preset > GP_BRUSH_PRESET_VERTEX_REPLACE)) { continue; } @@ -2119,19 +2119,19 @@ static int gpencil_brush_reset_all_exec(bContext *C, wmOperator *UNUSED(op)) Paint *paint = NULL; switch (mode) { - case CTX_MODE_PAINT_GPENCIL: { + case CTX_MODE_PAINT_GPENCIL_LEGACY: { paint = &ts->gp_paint->paint; break; } - case CTX_MODE_SCULPT_GPENCIL: { + case CTX_MODE_SCULPT_GPENCIL_LEGACY: { paint = &ts->gp_sculptpaint->paint; break; } - case CTX_MODE_WEIGHT_GPENCIL: { + case CTX_MODE_WEIGHT_GPENCIL_LEGACY: { paint = &ts->gp_weightpaint->paint; break; } - case CTX_MODE_VERTEX_GPENCIL: { + case CTX_MODE_VERTEX_GPENCIL_LEGACY: { paint = &ts->gp_vertexpaint->paint; break; } @@ -2144,19 +2144,19 @@ static int gpencil_brush_reset_all_exec(bContext *C, wmOperator *UNUSED(op)) if (paint->brush) { Brush *brush_active = paint->brush; switch (mode) { - case CTX_MODE_PAINT_GPENCIL: { + case CTX_MODE_PAINT_GPENCIL_LEGACY: { tool = brush_active->gpencil_tool; break; } - case CTX_MODE_SCULPT_GPENCIL: { + case CTX_MODE_SCULPT_GPENCIL_LEGACY: { tool = brush_active->gpencil_sculpt_tool; break; } - case CTX_MODE_WEIGHT_GPENCIL: { + case CTX_MODE_WEIGHT_GPENCIL_LEGACY: { tool = brush_active->gpencil_weight_tool; break; } - case CTX_MODE_VERTEX_GPENCIL: { + case CTX_MODE_VERTEX_GPENCIL_LEGACY: { tool = brush_active->gpencil_vertex_tool; break; } @@ -2170,19 +2170,19 @@ static int gpencil_brush_reset_all_exec(bContext *C, wmOperator *UNUSED(op)) gpencil_brush_delete_mode_brushes(bmain, paint, mode); switch (mode) { - case CTX_MODE_PAINT_GPENCIL: { + case CTX_MODE_PAINT_GPENCIL_LEGACY: { BKE_brush_gpencil_paint_presets(bmain, ts, true); break; } - case CTX_MODE_SCULPT_GPENCIL: { + case CTX_MODE_SCULPT_GPENCIL_LEGACY: { BKE_brush_gpencil_sculpt_presets(bmain, ts, true); break; } - case CTX_MODE_WEIGHT_GPENCIL: { + case CTX_MODE_WEIGHT_GPENCIL_LEGACY: { BKE_brush_gpencil_weight_presets(bmain, ts, true); break; } - case CTX_MODE_VERTEX_GPENCIL: { + case CTX_MODE_VERTEX_GPENCIL_LEGACY: { BKE_brush_gpencil_vertex_presets(bmain, ts, true); break; } @@ -2232,7 +2232,7 @@ static bool gpencil_vertex_group_poll(bContext *C) if (BKE_id_is_editable(bmain, &ob->id) && BKE_id_is_editable(bmain, ob->data) && !BLI_listbase_is_empty(&gpd->vertex_group_names)) { - if (ELEM(ob->mode, OB_MODE_EDIT_GPENCIL, OB_MODE_SCULPT_GPENCIL)) { + if (ELEM(ob->mode, OB_MODE_EDIT_GPENCIL_LEGACY, OB_MODE_SCULPT_GPENCIL_LEGACY)) { return true; } } @@ -2251,7 +2251,7 @@ static bool gpencil_vertex_group_weight_poll(bContext *C) if (BKE_id_is_editable(bmain, &ob->id) && BKE_id_is_editable(bmain, ob->data) && !BLI_listbase_is_empty(&gpd->vertex_group_names)) { - if (ob->mode == OB_MODE_WEIGHT_GPENCIL) { + if (ob->mode == OB_MODE_WEIGHT_GPENCIL_LEGACY) { return true; } } diff --git a/source/blender/editors/gpencil_legacy/gpencil_edit.c b/source/blender/editors/gpencil_legacy/gpencil_edit.c index 79ebb2630a9..a144a927c19 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_edit.c +++ b/source/blender/editors/gpencil_legacy/gpencil_edit.c @@ -179,7 +179,7 @@ static int gpencil_editmode_toggle_exec(bContext *C, wmOperator *op) } /* set mode */ if (gpd->flag & GP_DATA_STROKE_EDITMODE) { - mode = OB_MODE_EDIT_GPENCIL; + mode = OB_MODE_EDIT_GPENCIL_LEGACY; } else { mode = OB_MODE_OBJECT; @@ -262,7 +262,8 @@ static bool gpencil_selectmode_toggle_poll(bContext *C) { /* edit only supported with grease pencil objects */ Object *ob = CTX_data_active_object(C); - if ((ob == NULL) || (ob->type != OB_GPENCIL_LEGACY) || (ob->mode != OB_MODE_EDIT_GPENCIL)) { + if ((ob == NULL) || (ob->type != OB_GPENCIL_LEGACY) || (ob->mode != OB_MODE_EDIT_GPENCIL_LEGACY)) + { return false; } @@ -374,7 +375,7 @@ static int gpencil_paintmode_toggle_exec(bContext *C, wmOperator *op) gpd->flag ^= GP_DATA_STROKE_PAINTMODE; /* set mode */ if (gpd->flag & GP_DATA_STROKE_PAINTMODE) { - mode = OB_MODE_PAINT_GPENCIL; + mode = OB_MODE_PAINT_GPENCIL_LEGACY; } else { mode = OB_MODE_OBJECT; @@ -389,7 +390,7 @@ static int gpencil_paintmode_toggle_exec(bContext *C, wmOperator *op) ob->mode = mode; } - if (mode == OB_MODE_PAINT_GPENCIL) { + if (mode == OB_MODE_PAINT_GPENCIL_LEGACY) { /* Be sure we have brushes and Paint settings. * Need Draw and Vertex (used for Tint). */ BKE_paint_ensure(ts, (Paint **)&ts->gp_paint); @@ -490,7 +491,7 @@ static int gpencil_sculptmode_toggle_exec(bContext *C, wmOperator *op) gpd->flag ^= GP_DATA_STROKE_SCULPTMODE; /* set mode */ if (gpd->flag & GP_DATA_STROKE_SCULPTMODE) { - mode = OB_MODE_SCULPT_GPENCIL; + mode = OB_MODE_SCULPT_GPENCIL_LEGACY; } else { mode = OB_MODE_OBJECT; @@ -505,7 +506,7 @@ static int gpencil_sculptmode_toggle_exec(bContext *C, wmOperator *op) ob->mode = mode; } - if (mode == OB_MODE_SCULPT_GPENCIL) { + if (mode == OB_MODE_SCULPT_GPENCIL_LEGACY) { /* Be sure we have brushes. */ BKE_paint_ensure(ts, (Paint **)&ts->gp_sculptpaint); @@ -590,7 +591,7 @@ static int gpencil_weightmode_toggle_exec(bContext *C, wmOperator *op) gpd = ob->data; is_object = true; } - const int mode_flag = OB_MODE_WEIGHT_GPENCIL; + const int mode_flag = OB_MODE_WEIGHT_GPENCIL_LEGACY; const bool is_mode_set = (ob->mode & mode_flag) != 0; if (gpd == NULL) { @@ -601,7 +602,7 @@ static int gpencil_weightmode_toggle_exec(bContext *C, wmOperator *op) gpd->flag ^= GP_DATA_STROKE_WEIGHTMODE; /* set mode */ if (gpd->flag & GP_DATA_STROKE_WEIGHTMODE) { - mode = OB_MODE_WEIGHT_GPENCIL; + mode = OB_MODE_WEIGHT_GPENCIL_LEGACY; } else { mode = OB_MODE_OBJECT; @@ -619,7 +620,7 @@ static int gpencil_weightmode_toggle_exec(bContext *C, wmOperator *op) ED_object_posemode_set_for_weight_paint(C, bmain, ob, is_mode_set); } - if (mode == OB_MODE_WEIGHT_GPENCIL) { + if (mode == OB_MODE_WEIGHT_GPENCIL_LEGACY) { /* Be sure we have brushes. */ BKE_paint_ensure(ts, (Paint **)&ts->gp_weightpaint); @@ -710,7 +711,7 @@ static int gpencil_vertexmode_toggle_exec(bContext *C, wmOperator *op) gpd->flag ^= GP_DATA_STROKE_VERTEXMODE; /* set mode */ if (gpd->flag & GP_DATA_STROKE_VERTEXMODE) { - mode = OB_MODE_VERTEX_GPENCIL; + mode = OB_MODE_VERTEX_GPENCIL_LEGACY; } else { mode = OB_MODE_OBJECT; @@ -725,7 +726,7 @@ static int gpencil_vertexmode_toggle_exec(bContext *C, wmOperator *op) ob->mode = mode; } - if (mode == OB_MODE_VERTEX_GPENCIL) { + if (mode == OB_MODE_VERTEX_GPENCIL_LEGACY) { /* Be sure we have brushes. * Need Draw as well (used for Palettes). */ BKE_paint_ensure(ts, (Paint **)&ts->gp_paint); @@ -5764,8 +5765,9 @@ bool ED_object_gpencil_exit(Main *bmain, Object *ob) GP_DATA_STROKE_WEIGHTMODE | GP_DATA_STROKE_VERTEXMODE); ob->restore_mode = ob->mode; - ob->mode &= ~(OB_MODE_PAINT_GPENCIL | OB_MODE_EDIT_GPENCIL | OB_MODE_SCULPT_GPENCIL | - OB_MODE_WEIGHT_GPENCIL | OB_MODE_VERTEX_GPENCIL); + ob->mode &= ~(OB_MODE_PAINT_GPENCIL_LEGACY | OB_MODE_EDIT_GPENCIL_LEGACY | + OB_MODE_SCULPT_GPENCIL_LEGACY | OB_MODE_WEIGHT_GPENCIL_LEGACY | + OB_MODE_VERTEX_GPENCIL_LEGACY); /* Inform all CoW versions that we changed the mode. */ DEG_id_tag_update_ex(bmain, &ob->id, ID_RECALC_COPY_ON_WRITE); @@ -5793,7 +5795,7 @@ static bool gpencil_merge_by_distance_poll(bContext *C) bGPDlayer *gpl = BKE_gpencil_layer_active_get(gpd); - return ((gpl != NULL) && (ob->mode == OB_MODE_EDIT_GPENCIL)); + return ((gpl != NULL) && (ob->mode == OB_MODE_EDIT_GPENCIL_LEGACY)); } static int gpencil_merge_by_distance_exec(bContext *C, wmOperator *op) @@ -5880,7 +5882,7 @@ static bool gpencil_stroke_normalize_poll(bContext *C) bGPDlayer *gpl = BKE_gpencil_layer_active_get(gpd); - return ((gpl != NULL) && (ob->mode == OB_MODE_EDIT_GPENCIL)); + return ((gpl != NULL) && (ob->mode == OB_MODE_EDIT_GPENCIL_LEGACY)); } static void gpencil_stroke_normalize_ui(bContext *UNUSED(C), wmOperator *op) diff --git a/source/blender/editors/gpencil_legacy/gpencil_fill.c b/source/blender/editors/gpencil_legacy/gpencil_fill.c index 276cfb66d31..4d48f8f9760 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_fill.c +++ b/source/blender/editors/gpencil_legacy/gpencil_fill.c @@ -2334,7 +2334,7 @@ static bool gpencil_fill_poll(bContext *C) ScrArea *area = CTX_wm_area(C); if (area->spacetype == SPACE_VIEW3D) { if ((obact == NULL) || (obact->type != OB_GPENCIL_LEGACY) || - (obact->mode != OB_MODE_PAINT_GPENCIL)) + (obact->mode != OB_MODE_PAINT_GPENCIL_LEGACY)) { return false; } diff --git a/source/blender/editors/gpencil_legacy/gpencil_paint.c b/source/blender/editors/gpencil_legacy/gpencil_paint.c index 9c0dc933d76..dde85efce48 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_paint.c +++ b/source/blender/editors/gpencil_legacy/gpencil_paint.c @@ -1912,7 +1912,8 @@ static Brush *gpencil_get_default_eraser(Main *bmain, ToolSettings *ts) if (brush->gpencil_settings == NULL) { continue; } - if ((brush->ob_mode == OB_MODE_PAINT_GPENCIL) && (brush->gpencil_tool == GPAINT_TOOL_ERASE)) { + if ((brush->ob_mode == OB_MODE_PAINT_GPENCIL_LEGACY) && + (brush->gpencil_tool == GPAINT_TOOL_ERASE)) { /* save first eraser to use later if no default */ if (brush_dft == NULL) { brush_dft = brush; @@ -1930,7 +1931,7 @@ static Brush *gpencil_get_default_eraser(Main *bmain, ToolSettings *ts) } /* create a new soft eraser brush */ - brush_dft = BKE_brush_add_gpencil(bmain, ts, "Soft Eraser", OB_MODE_PAINT_GPENCIL); + brush_dft = BKE_brush_add_gpencil(bmain, ts, "Soft Eraser", OB_MODE_PAINT_GPENCIL_LEGACY); brush_dft->size = 30.0f; brush_dft->gpencil_settings->flag |= GP_BRUSH_DEFAULT_ERASER; brush_dft->gpencil_settings->icon_id = GP_BRUSH_ICON_ERASE_SOFT; @@ -3335,7 +3336,7 @@ static int gpencil_draw_invoke(bContext *C, wmOperator *op, const wmEvent *event p->gpd->flag &= ~GP_DATA_STROKE_WEIGHTMODE; /* set workspace mode */ ob->restore_mode = ob->mode; - ob->mode = OB_MODE_PAINT_GPENCIL; + ob->mode = OB_MODE_PAINT_GPENCIL_LEGACY; /* redraw mode on screen */ WM_event_add_notifier(C, NC_SCENE | ND_MODE, NULL); } diff --git a/source/blender/editors/gpencil_legacy/gpencil_select.c b/source/blender/editors/gpencil_legacy/gpencil_select.c index 2c00f4c5a89..163d05ff5d7 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_select.c +++ b/source/blender/editors/gpencil_legacy/gpencil_select.c @@ -543,10 +543,10 @@ static int gpencil_select_random_exec(bContext *C, wmOperator *op) const bool is_curve_edit = (bool)GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd); int selectmode; - if (ob && ob->mode == OB_MODE_SCULPT_GPENCIL) { + if (ob && ob->mode == OB_MODE_SCULPT_GPENCIL_LEGACY) { selectmode = gpencil_select_mode_from_sculpt(ts->gpencil_selectmode_sculpt); } - else if (ob && ob->mode == OB_MODE_VERTEX_GPENCIL) { + else if (ob && ob->mode == OB_MODE_VERTEX_GPENCIL_LEGACY) { selectmode = gpencil_select_mode_from_vertex(ts->gpencil_selectmode_vertex); } else { @@ -1671,10 +1671,10 @@ static int gpencil_circle_select_exec(bContext *C, wmOperator *op) const bool is_curve_edit = (bool)GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd); int selectmode; - if (ob && ob->mode == OB_MODE_SCULPT_GPENCIL) { + if (ob && ob->mode == OB_MODE_SCULPT_GPENCIL_LEGACY) { selectmode = gpencil_select_mode_from_sculpt(ts->gpencil_selectmode_sculpt); } - else if (ob && ob->mode == OB_MODE_VERTEX_GPENCIL) { + else if (ob && ob->mode == OB_MODE_VERTEX_GPENCIL_LEGACY) { selectmode = gpencil_select_mode_from_vertex(ts->gpencil_selectmode_vertex); } else { @@ -2161,10 +2161,10 @@ static int gpencil_generic_select_exec(bContext *C, const bool is_curve_edit = (bool)GPENCIL_CURVE_EDIT_SESSIONS_ON(gpd); int selectmode; - if (ob && ob->mode == OB_MODE_SCULPT_GPENCIL) { + if (ob && ob->mode == OB_MODE_SCULPT_GPENCIL_LEGACY) { selectmode = gpencil_select_mode_from_sculpt(ts->gpencil_selectmode_sculpt); } - else if (ob && ob->mode == OB_MODE_VERTEX_GPENCIL) { + else if (ob && ob->mode == OB_MODE_VERTEX_GPENCIL_LEGACY) { selectmode = gpencil_select_mode_from_vertex(ts->gpencil_selectmode_vertex); } else { @@ -2436,11 +2436,11 @@ static int gpencil_select_exec(bContext *C, wmOperator *op) } /* if select mode is stroke, use whole stroke */ - if ((ob) && (ob->mode == OB_MODE_SCULPT_GPENCIL)) { + if ((ob) && (ob->mode == OB_MODE_SCULPT_GPENCIL_LEGACY)) { whole |= (bool)(gpencil_select_mode_from_sculpt(ts->gpencil_selectmode_sculpt) == GP_SELECTMODE_STROKE); } - else if ((ob) && (ob->mode == OB_MODE_VERTEX_GPENCIL)) { + else if ((ob) && (ob->mode == OB_MODE_VERTEX_GPENCIL_LEGACY)) { whole |= (bool)(gpencil_select_mode_from_vertex(ts->gpencil_selectmode_sculpt) == GP_SELECTMODE_STROKE); } @@ -2602,10 +2602,10 @@ static int gpencil_select_exec(bContext *C, wmOperator *op) /* expand selection to segment */ int selectmode; - if (ob && ob->mode == OB_MODE_SCULPT_GPENCIL) { + if (ob && ob->mode == OB_MODE_SCULPT_GPENCIL_LEGACY) { selectmode = gpencil_select_mode_from_sculpt(ts->gpencil_selectmode_sculpt); } - else if (ob && ob->mode == OB_MODE_VERTEX_GPENCIL) { + else if (ob && ob->mode == OB_MODE_VERTEX_GPENCIL_LEGACY) { selectmode = gpencil_select_mode_from_vertex(ts->gpencil_selectmode_vertex); } else { diff --git a/source/blender/editors/gpencil_legacy/gpencil_utils.c b/source/blender/editors/gpencil_legacy/gpencil_utils.c index 852c507b116..9bc35f27505 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_utils.c +++ b/source/blender/editors/gpencil_legacy/gpencil_utils.c @@ -1789,7 +1789,7 @@ float ED_gpencil_radial_control_scale(bContext *C, const int mval[2]) { float scale_fac = 1.0f; - if ((brush && brush->gpencil_settings) && (brush->ob_mode == OB_MODE_PAINT_GPENCIL) && + if ((brush && brush->gpencil_settings) && (brush->ob_mode == OB_MODE_PAINT_GPENCIL_LEGACY) && (brush->gpencil_tool == GPAINT_TOOL_DRAW)) { float cursor_radius = ED_gpencil_cursor_radius(C, mval[0], mval[1]); @@ -2029,7 +2029,7 @@ void ED_gpencil_setup_modes(bContext *C, bGPdata *gpd, int newmode) } switch (newmode) { - case OB_MODE_EDIT_GPENCIL: + case OB_MODE_EDIT_GPENCIL_LEGACY: gpd->flag |= GP_DATA_STROKE_EDITMODE; gpd->flag &= ~GP_DATA_STROKE_PAINTMODE; gpd->flag &= ~GP_DATA_STROKE_SCULPTMODE; @@ -2037,7 +2037,7 @@ void ED_gpencil_setup_modes(bContext *C, bGPdata *gpd, int newmode) gpd->flag &= ~GP_DATA_STROKE_VERTEXMODE; ED_gpencil_toggle_brush_cursor(C, false, NULL); break; - case OB_MODE_PAINT_GPENCIL: + case OB_MODE_PAINT_GPENCIL_LEGACY: gpd->flag &= ~GP_DATA_STROKE_EDITMODE; gpd->flag |= GP_DATA_STROKE_PAINTMODE; gpd->flag &= ~GP_DATA_STROKE_SCULPTMODE; @@ -2045,7 +2045,7 @@ void ED_gpencil_setup_modes(bContext *C, bGPdata *gpd, int newmode) gpd->flag &= ~GP_DATA_STROKE_VERTEXMODE; ED_gpencil_toggle_brush_cursor(C, true, NULL); break; - case OB_MODE_SCULPT_GPENCIL: + case OB_MODE_SCULPT_GPENCIL_LEGACY: gpd->flag &= ~GP_DATA_STROKE_EDITMODE; gpd->flag &= ~GP_DATA_STROKE_PAINTMODE; gpd->flag |= GP_DATA_STROKE_SCULPTMODE; @@ -2053,7 +2053,7 @@ void ED_gpencil_setup_modes(bContext *C, bGPdata *gpd, int newmode) gpd->flag &= ~GP_DATA_STROKE_VERTEXMODE; ED_gpencil_toggle_brush_cursor(C, true, NULL); break; - case OB_MODE_WEIGHT_GPENCIL: + case OB_MODE_WEIGHT_GPENCIL_LEGACY: gpd->flag &= ~GP_DATA_STROKE_EDITMODE; gpd->flag &= ~GP_DATA_STROKE_PAINTMODE; gpd->flag &= ~GP_DATA_STROKE_SCULPTMODE; @@ -2061,7 +2061,7 @@ void ED_gpencil_setup_modes(bContext *C, bGPdata *gpd, int newmode) gpd->flag &= ~GP_DATA_STROKE_VERTEXMODE; ED_gpencil_toggle_brush_cursor(C, true, NULL); break; - case OB_MODE_VERTEX_GPENCIL: + case OB_MODE_VERTEX_GPENCIL_LEGACY: gpd->flag &= ~GP_DATA_STROKE_EDITMODE; gpd->flag &= ~GP_DATA_STROKE_PAINTMODE; gpd->flag &= ~GP_DATA_STROKE_SCULPTMODE; diff --git a/source/blender/editors/gpencil_legacy/gpencil_uv.c b/source/blender/editors/gpencil_legacy/gpencil_uv.c index f64475d6cc5..f8a59eece81 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_uv.c +++ b/source/blender/editors/gpencil_legacy/gpencil_uv.c @@ -338,7 +338,7 @@ static bool gpencil_transform_fill_poll(bContext *C) bGPDlayer *gpl = BKE_gpencil_layer_active_get(gpd); - if ((gpl == NULL) || (ob->mode != OB_MODE_EDIT_GPENCIL)) { + if ((gpl == NULL) || (ob->mode != OB_MODE_EDIT_GPENCIL_LEGACY)) { return false; } diff --git a/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.c b/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.c index 61e64183947..2e393cb4962 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.c +++ b/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.c @@ -702,8 +702,8 @@ static bool gpencil_vertexpaint_brush_init(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); ToolSettings *ts = CTX_data_tool_settings(C); Object *ob = CTX_data_active_object(C); - Paint *paint = ob->mode == OB_MODE_VERTEX_GPENCIL ? &ts->gp_vertexpaint->paint : - &ts->gp_paint->paint; + Paint *paint = ob->mode == OB_MODE_VERTEX_GPENCIL_LEGACY ? &ts->gp_vertexpaint->paint : + &ts->gp_paint->paint; /* set the brush using the tool */ tGP_BrushVertexpaintData *gso; @@ -990,8 +990,8 @@ static bool gpencil_vertexpaint_brush_do_frame(bContext *C, const float bound_mat[4][4]) { Object *ob = CTX_data_active_object(C); - const char tool = ob->mode == OB_MODE_VERTEX_GPENCIL ? gso->brush->gpencil_vertex_tool : - gso->brush->gpencil_tool; + const char tool = ob->mode == OB_MODE_VERTEX_GPENCIL_LEGACY ? gso->brush->gpencil_vertex_tool : + gso->brush->gpencil_tool; const int radius = (gso->brush->flag & GP_BRUSH_USE_PRESSURE) ? gso->brush->size * gso->pressure : gso->brush->size; diff --git a/source/blender/editors/interface/interface_icons.cc b/source/blender/editors/interface/interface_icons.cc index 47a9ce9d321..e9dfc80ee33 100644 --- a/source/blender/editors/interface/interface_icons.cc +++ b/source/blender/editors/interface/interface_icons.cc @@ -2480,17 +2480,17 @@ int UI_icon_from_object_mode(const int mode) case OB_MODE_OBJECT: return ICON_OBJECT_DATAMODE; case OB_MODE_EDIT: - case OB_MODE_EDIT_GPENCIL: + case OB_MODE_EDIT_GPENCIL_LEGACY: return ICON_EDITMODE_HLT; case OB_MODE_SCULPT: - case OB_MODE_SCULPT_GPENCIL: + case OB_MODE_SCULPT_GPENCIL_LEGACY: case OB_MODE_SCULPT_CURVES: return ICON_SCULPTMODE_HLT; case OB_MODE_VERTEX_PAINT: - case OB_MODE_VERTEX_GPENCIL: + case OB_MODE_VERTEX_GPENCIL_LEGACY: return ICON_VPAINT_HLT; case OB_MODE_WEIGHT_PAINT: - case OB_MODE_WEIGHT_GPENCIL: + case OB_MODE_WEIGHT_GPENCIL_LEGACY: return ICON_WPAINT_HLT; case OB_MODE_TEXTURE_PAINT: return ICON_TPAINT_HLT; @@ -2498,7 +2498,7 @@ int UI_icon_from_object_mode(const int mode) return ICON_PARTICLEMODE; case OB_MODE_POSE: return ICON_POSE_HLT; - case OB_MODE_PAINT_GPENCIL: + case OB_MODE_PAINT_GPENCIL_LEGACY: return ICON_GREASEPENCIL; } return ICON_NONE; diff --git a/source/blender/editors/object/object_edit.cc b/source/blender/editors/object/object_edit.cc index a5a742469d3..11e752ad96e 100644 --- a/source/blender/editors/object/object_edit.cc +++ b/source/blender/editors/object/object_edit.cc @@ -1760,7 +1760,7 @@ static int object_mode_set_exec(bContext *C, wmOperator *op) /* by default the operator assume is a mesh, but if gp object change mode */ if ((ob->type == OB_GPENCIL_LEGACY) && (mode == OB_MODE_EDIT)) { - mode = OB_MODE_EDIT_GPENCIL; + mode = OB_MODE_EDIT_GPENCIL_LEGACY; } if (!ED_object_mode_compat_test(ob, mode)) { diff --git a/source/blender/editors/object/object_modes.cc b/source/blender/editors/object/object_modes.cc index da5812de2b8..74e8151e9ba 100644 --- a/source/blender/editors/object/object_modes.cc +++ b/source/blender/editors/object/object_modes.cc @@ -81,24 +81,24 @@ static const char *object_mode_op_string(eObjectMode mode) if (mode == OB_MODE_POSE) { return "OBJECT_OT_posemode_toggle"; } - if (mode == OB_MODE_EDIT_GPENCIL) { + if (mode == OB_MODE_EDIT_GPENCIL_LEGACY) { return "GPENCIL_OT_editmode_toggle"; } if (U.experimental.use_grease_pencil_version3) { - if (mode == OB_MODE_PAINT_GPENCIL) { + if (mode == OB_MODE_PAINT_GPENCIL_LEGACY) { return "GREASE_PENCIL_OT_draw_mode_toggle"; } } - if (mode == OB_MODE_PAINT_GPENCIL) { + if (mode == OB_MODE_PAINT_GPENCIL_LEGACY) { return "GPENCIL_OT_paintmode_toggle"; } - if (mode == OB_MODE_SCULPT_GPENCIL) { + if (mode == OB_MODE_SCULPT_GPENCIL_LEGACY) { return "GPENCIL_OT_sculptmode_toggle"; } - if (mode == OB_MODE_WEIGHT_GPENCIL) { + if (mode == OB_MODE_WEIGHT_GPENCIL_LEGACY) { return "GPENCIL_OT_weightmode_toggle"; } - if (mode == OB_MODE_VERTEX_GPENCIL) { + if (mode == OB_MODE_VERTEX_GPENCIL_LEGACY) { return "GPENCIL_OT_vertexmode_toggle"; } if (mode == OB_MODE_SCULPT_CURVES) { @@ -146,7 +146,7 @@ bool ED_object_mode_compat_test(const Object *ob, eObjectMode mode) } break; case OB_GPENCIL_LEGACY: - if (mode & (OB_MODE_EDIT_GPENCIL | OB_MODE_ALL_PAINT_GPENCIL)) { + if (mode & (OB_MODE_EDIT_GPENCIL_LEGACY | OB_MODE_ALL_PAINT_GPENCIL)) { return true; } break; @@ -156,7 +156,7 @@ bool ED_object_mode_compat_test(const Object *ob, eObjectMode mode) } break; case OB_GREASE_PENCIL: - if (mode & (OB_MODE_EDIT | OB_MODE_PAINT_GPENCIL)) { + if (mode & (OB_MODE_EDIT | OB_MODE_PAINT_GPENCIL_LEGACY)) { return true; } break; @@ -208,7 +208,7 @@ bool ED_object_mode_set_ex(bContext *C, eObjectMode mode, bool use_undo, ReportL } if ((ob->type == OB_GPENCIL_LEGACY) && (mode == OB_MODE_EDIT)) { - mode = OB_MODE_EDIT_GPENCIL; + mode = OB_MODE_EDIT_GPENCIL_LEGACY; } if (ob->mode == mode) { diff --git a/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc b/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc index 4d024767a0c..0db60f13b2e 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc +++ b/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc @@ -188,7 +188,7 @@ static void grease_pencil_draw_mode_enter(bContext *C) GpPaint *grease_pencil_paint = scene->toolsettings->gp_paint; BKE_paint_ensure(scene->toolsettings, (Paint **)&grease_pencil_paint); - ob->mode = OB_MODE_PAINT_GPENCIL; + ob->mode = OB_MODE_PAINT_GPENCIL_LEGACY; /* TODO: Setup cursor color. BKE_paint_init() could be used, but creates an additional brush. */ /* TODO: Call ED_paint_cursor_start(...) */ @@ -212,10 +212,10 @@ static int grease_pencil_draw_mode_toggle_exec(bContext *C, wmOperator *op) Object *ob = CTX_data_active_object(C); wmMsgBus *mbus = CTX_wm_message_bus(C); - const bool is_mode_set = ob->mode == OB_MODE_PAINT_GPENCIL; + const bool is_mode_set = ob->mode == OB_MODE_PAINT_GPENCIL_LEGACY; if (is_mode_set) { - if (!ED_object_mode_compat_set(C, ob, OB_MODE_PAINT_GPENCIL, op->reports)) { + if (!ED_object_mode_compat_set(C, ob, OB_MODE_PAINT_GPENCIL_LEGACY, op->reports)) { return OPERATOR_CANCELLED; } } diff --git a/source/blender/editors/sculpt_paint/paint_ops.cc b/source/blender/editors/sculpt_paint/paint_ops.cc index 59a15dfeae5..cd40e2da076 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.cc +++ b/source/blender/editors/sculpt_paint/paint_ops.cc @@ -90,7 +90,7 @@ static eGPBrush_Presets gpencil_get_brush_preset_from_tool(bToolRef *tool, enum eContextObjectMode mode) { switch (mode) { - case CTX_MODE_PAINT_GPENCIL: { + case CTX_MODE_PAINT_GPENCIL_LEGACY: { if (STREQ(tool->runtime->data_block, "DRAW")) { return GP_BRUSH_PRESET_PENCIL; } @@ -105,7 +105,7 @@ static eGPBrush_Presets gpencil_get_brush_preset_from_tool(bToolRef *tool, } break; } - case CTX_MODE_SCULPT_GPENCIL: { + case CTX_MODE_SCULPT_GPENCIL_LEGACY: { if (STREQ(tool->runtime->data_block, "SMOOTH")) { return GP_BRUSH_PRESET_SMOOTH_STROKE; } @@ -135,7 +135,7 @@ static eGPBrush_Presets gpencil_get_brush_preset_from_tool(bToolRef *tool, } break; } - case CTX_MODE_WEIGHT_GPENCIL: { + case CTX_MODE_WEIGHT_GPENCIL_LEGACY: { if (STREQ(tool->runtime->data_block, "DRAW")) { return GP_BRUSH_PRESET_WEIGHT_DRAW; } @@ -150,7 +150,7 @@ static eGPBrush_Presets gpencil_get_brush_preset_from_tool(bToolRef *tool, } break; } - case CTX_MODE_VERTEX_GPENCIL: { + case CTX_MODE_VERTEX_GPENCIL_LEGACY: { if (STREQ(tool->runtime->data_block, "DRAW")) { return GP_BRUSH_PRESET_VERTEX_DRAW; } @@ -208,19 +208,19 @@ static int brush_add_gpencil_exec(bContext *C, wmOperator * /*op*/) /* Get Brush mode base on context mode. */ const enum eContextObjectMode mode = CTX_data_mode_enum(C); - eObjectMode obmode = OB_MODE_PAINT_GPENCIL; + eObjectMode obmode = OB_MODE_PAINT_GPENCIL_LEGACY; switch (mode) { - case CTX_MODE_PAINT_GPENCIL: - obmode = OB_MODE_PAINT_GPENCIL; + case CTX_MODE_PAINT_GPENCIL_LEGACY: + obmode = OB_MODE_PAINT_GPENCIL_LEGACY; break; - case CTX_MODE_SCULPT_GPENCIL: - obmode = OB_MODE_SCULPT_GPENCIL; + case CTX_MODE_SCULPT_GPENCIL_LEGACY: + obmode = OB_MODE_SCULPT_GPENCIL_LEGACY; break; - case CTX_MODE_WEIGHT_GPENCIL: - obmode = OB_MODE_WEIGHT_GPENCIL; + case CTX_MODE_WEIGHT_GPENCIL_LEGACY: + obmode = OB_MODE_WEIGHT_GPENCIL_LEGACY; break; - case CTX_MODE_VERTEX_GPENCIL: - obmode = OB_MODE_VERTEX_GPENCIL; + case CTX_MODE_VERTEX_GPENCIL_LEGACY: + obmode = OB_MODE_VERTEX_GPENCIL_LEGACY; break; default: return OPERATOR_CANCELLED; diff --git a/source/blender/editors/space_view3d/space_view3d.cc b/source/blender/editors/space_view3d/space_view3d.cc index c187531724a..2b757af8e42 100644 --- a/source/blender/editors/space_view3d/space_view3d.cc +++ b/source/blender/editors/space_view3d/space_view3d.cc @@ -1726,16 +1726,16 @@ void ED_view3d_buttons_region_layout_ex(const bContext *C, case CTX_MODE_OBJECT: ARRAY_SET_ITEMS(contexts, ".objectmode"); break; - case CTX_MODE_PAINT_GPENCIL: + case CTX_MODE_PAINT_GPENCIL_LEGACY: ARRAY_SET_ITEMS(contexts, ".greasepencil_paint"); break; - case CTX_MODE_SCULPT_GPENCIL: + case CTX_MODE_SCULPT_GPENCIL_LEGACY: ARRAY_SET_ITEMS(contexts, ".greasepencil_sculpt"); break; - case CTX_MODE_WEIGHT_GPENCIL: + case CTX_MODE_WEIGHT_GPENCIL_LEGACY: ARRAY_SET_ITEMS(contexts, ".greasepencil_weight"); break; - case CTX_MODE_VERTEX_GPENCIL: + case CTX_MODE_VERTEX_GPENCIL_LEGACY: ARRAY_SET_ITEMS(contexts, ".greasepencil_vertex"); break; case CTX_MODE_SCULPT_CURVES: @@ -1746,19 +1746,19 @@ void ED_view3d_buttons_region_layout_ex(const bContext *C, } switch (mode) { - case CTX_MODE_PAINT_GPENCIL: + case CTX_MODE_PAINT_GPENCIL_LEGACY: ARRAY_SET_ITEMS(contexts, ".greasepencil_paint"); break; - case CTX_MODE_SCULPT_GPENCIL: + case CTX_MODE_SCULPT_GPENCIL_LEGACY: ARRAY_SET_ITEMS(contexts, ".greasepencil_sculpt"); break; - case CTX_MODE_WEIGHT_GPENCIL: + case CTX_MODE_WEIGHT_GPENCIL_LEGACY: ARRAY_SET_ITEMS(contexts, ".greasepencil_weight"); break; case CTX_MODE_EDIT_GPENCIL_LEGACY: ARRAY_SET_ITEMS(contexts, ".greasepencil_edit"); break; - case CTX_MODE_VERTEX_GPENCIL: + case CTX_MODE_VERTEX_GPENCIL_LEGACY: ARRAY_SET_ITEMS(contexts, ".greasepencil_vertex"); break; default: diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 5f7da56ed08..a6b9429f283 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -148,7 +148,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve t->flag = 0; if (obact && !(t->options & (CTX_CURSOR | CTX_TEXTURE_SPACE)) && - ELEM(object_mode, OB_MODE_EDIT, OB_MODE_EDIT_GPENCIL)) + ELEM(object_mode, OB_MODE_EDIT, OB_MODE_EDIT_GPENCIL_LEGACY)) { t->obedit_type = obact->type; } diff --git a/source/blender/editors/transform/transform_gizmo_extrude_3d.c b/source/blender/editors/transform/transform_gizmo_extrude_3d.c index f32dd958f0b..a104a498b60 100644 --- a/source/blender/editors/transform/transform_gizmo_extrude_3d.c +++ b/source/blender/editors/transform/transform_gizmo_extrude_3d.c @@ -142,7 +142,7 @@ static void gizmo_mesh_extrude_setup(const bContext *C, wmGizmoGroup *gzgroup) { const char *op_idname = NULL; /* Grease pencil does not use `obedit`. */ - /* GPXX: Remove if OB_MODE_EDIT_GPENCIL is merged with OB_MODE_EDIT */ + /* GPXX: Remove if OB_MODE_EDIT_GPENCIL_LEGACY is merged with OB_MODE_EDIT */ const Object *obact = CTX_data_active_object(C); if (obact->type == OB_GPENCIL_LEGACY) { op_idname = "GPENCIL_OT_extrude_move"; diff --git a/source/blender/makesdna/DNA_object_enums.h b/source/blender/makesdna/DNA_object_enums.h index 6a00661f0f9..d9c871810f4 100644 --- a/source/blender/makesdna/DNA_object_enums.h +++ b/source/blender/makesdna/DNA_object_enums.h @@ -24,11 +24,11 @@ typedef enum eObjectMode { OB_MODE_TEXTURE_PAINT = 1 << 4, OB_MODE_PARTICLE_EDIT = 1 << 5, OB_MODE_POSE = 1 << 6, - OB_MODE_EDIT_GPENCIL = 1 << 7, - OB_MODE_PAINT_GPENCIL = 1 << 8, - OB_MODE_SCULPT_GPENCIL = 1 << 9, - OB_MODE_WEIGHT_GPENCIL = 1 << 10, - OB_MODE_VERTEX_GPENCIL = 1 << 11, + OB_MODE_EDIT_GPENCIL_LEGACY = 1 << 7, + OB_MODE_PAINT_GPENCIL_LEGACY = 1 << 8, + OB_MODE_SCULPT_GPENCIL_LEGACY = 1 << 9, + OB_MODE_WEIGHT_GPENCIL_LEGACY = 1 << 10, + OB_MODE_VERTEX_GPENCIL_LEGACY = 1 << 11, OB_MODE_SCULPT_CURVES = 1 << 12, } eObjectMode; @@ -47,14 +47,14 @@ typedef enum eDrawType { (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT) #define OB_MODE_ALL_PAINT_GPENCIL \ - (OB_MODE_PAINT_GPENCIL | OB_MODE_SCULPT_GPENCIL | OB_MODE_WEIGHT_GPENCIL | \ - OB_MODE_VERTEX_GPENCIL) + (OB_MODE_PAINT_GPENCIL_LEGACY | OB_MODE_SCULPT_GPENCIL_LEGACY | OB_MODE_WEIGHT_GPENCIL_LEGACY | \ + OB_MODE_VERTEX_GPENCIL_LEGACY) /** Any mode that uses Object.sculpt. */ #define OB_MODE_ALL_SCULPT (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT) /** Any mode that uses weightpaint. */ -#define OB_MODE_ALL_WEIGHT_PAINT (OB_MODE_WEIGHT_PAINT | OB_MODE_WEIGHT_GPENCIL) +#define OB_MODE_ALL_WEIGHT_PAINT (OB_MODE_WEIGHT_PAINT | OB_MODE_WEIGHT_GPENCIL_LEGACY) /** * Any mode that has data or for Grease Pencil modes, we need to free when switching modes, @@ -62,8 +62,8 @@ typedef enum eDrawType { */ #define OB_MODE_ALL_MODE_DATA \ (OB_MODE_EDIT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_SCULPT | OB_MODE_POSE | \ - OB_MODE_PAINT_GPENCIL | OB_MODE_EDIT_GPENCIL | OB_MODE_SCULPT_GPENCIL | \ - OB_MODE_WEIGHT_GPENCIL | OB_MODE_VERTEX_GPENCIL | OB_MODE_SCULPT_CURVES) + OB_MODE_PAINT_GPENCIL_LEGACY | OB_MODE_EDIT_GPENCIL_LEGACY | OB_MODE_SCULPT_GPENCIL_LEGACY | \ + OB_MODE_WEIGHT_GPENCIL_LEGACY | OB_MODE_VERTEX_GPENCIL_LEGACY | OB_MODE_SCULPT_CURVES) #ifdef __cplusplus } diff --git a/source/blender/makesrna/intern/rna_brush.cc b/source/blender/makesrna/intern/rna_brush.cc index 238dc95d020..73996766aed 100644 --- a/source/blender/makesrna/intern/rna_brush.cc +++ b/source/blender/makesrna/intern/rna_brush.cc @@ -1060,7 +1060,7 @@ static void rna_BrushGpencilSettings_default_eraser_update(Main *bmain, for (Brush *brush = static_cast(bmain->brushes.first); brush; brush = static_cast(brush->id.next)) { - if ((brush != brush_cur) && (brush->ob_mode == OB_MODE_PAINT_GPENCIL) && + if ((brush != brush_cur) && (brush->ob_mode == OB_MODE_PAINT_GPENCIL_LEGACY) && (brush->gpencil_tool == GPAINT_TOOL_ERASE)) { brush->gpencil_settings->flag &= ~GP_BRUSH_DEFAULT_ERASER; @@ -3708,11 +3708,11 @@ static void rna_def_brush(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Use Texture", "Use this brush in texture paint mode"); prop = RNA_def_property(srna, "use_paint_grease_pencil", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, nullptr, "ob_mode", OB_MODE_PAINT_GPENCIL); + RNA_def_property_boolean_sdna(prop, nullptr, "ob_mode", OB_MODE_PAINT_GPENCIL_LEGACY); RNA_def_property_ui_text(prop, "Use Paint", "Use this brush in grease pencil drawing mode"); prop = RNA_def_property(srna, "use_vertex_grease_pencil", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, nullptr, "ob_mode", OB_MODE_VERTEX_GPENCIL); + RNA_def_property_boolean_sdna(prop, nullptr, "ob_mode", OB_MODE_VERTEX_GPENCIL_LEGACY); RNA_def_property_ui_text( prop, "Use Vertex", "Use this brush in grease pencil vertex color mode"); diff --git a/source/blender/makesrna/intern/rna_context.cc b/source/blender/makesrna/intern/rna_context.cc index b958e2c9cde..bbc514a4366 100644 --- a/source/blender/makesrna/intern/rna_context.cc +++ b/source/blender/makesrna/intern/rna_context.cc @@ -39,11 +39,11 @@ const EnumPropertyItem rna_enum_context_mode_items[] = { {CTX_MODE_PAINT_TEXTURE, "PAINT_TEXTURE", 0, "Texture Paint", ""}, {CTX_MODE_PARTICLE, "PARTICLE", 0, "Particle", ""}, {CTX_MODE_OBJECT, "OBJECT", 0, "Object", ""}, - {CTX_MODE_PAINT_GPENCIL, "PAINT_GPENCIL", 0, "Grease Pencil Paint", ""}, + {CTX_MODE_PAINT_GPENCIL_LEGACY, "PAINT_GPENCIL", 0, "Grease Pencil Paint", ""}, {CTX_MODE_EDIT_GPENCIL_LEGACY, "EDIT_GPENCIL", 0, "Grease Pencil Edit", ""}, - {CTX_MODE_SCULPT_GPENCIL, "SCULPT_GPENCIL", 0, "Grease Pencil Sculpt", ""}, - {CTX_MODE_WEIGHT_GPENCIL, "WEIGHT_GPENCIL", 0, "Grease Pencil Weight Paint", ""}, - {CTX_MODE_VERTEX_GPENCIL, "VERTEX_GPENCIL", 0, "Grease Pencil Vertex Paint", ""}, + {CTX_MODE_SCULPT_GPENCIL_LEGACY, "SCULPT_GPENCIL", 0, "Grease Pencil Sculpt", ""}, + {CTX_MODE_WEIGHT_GPENCIL_LEGACY, "WEIGHT_GPENCIL", 0, "Grease Pencil Weight Paint", ""}, + {CTX_MODE_VERTEX_GPENCIL_LEGACY, "VERTEX_GPENCIL", 0, "Grease Pencil Vertex Paint", ""}, {CTX_MODE_SCULPT_CURVES, "SCULPT_CURVES", 0, "Curves Sculpt", ""}, {0, nullptr, 0, nullptr, nullptr}, }; diff --git a/source/blender/makesrna/intern/rna_object.cc b/source/blender/makesrna/intern/rna_object.cc index 1a8fde94eac..2f57163e204 100644 --- a/source/blender/makesrna/intern/rna_object.cc +++ b/source/blender/makesrna/intern/rna_object.cc @@ -60,27 +60,27 @@ const EnumPropertyItem rna_enum_object_mode_items[] = { {OB_MODE_WEIGHT_PAINT, "WEIGHT_PAINT", ICON_WPAINT_HLT, "Weight Paint", ""}, {OB_MODE_TEXTURE_PAINT, "TEXTURE_PAINT", ICON_TPAINT_HLT, "Texture Paint", ""}, {OB_MODE_PARTICLE_EDIT, "PARTICLE_EDIT", ICON_PARTICLEMODE, "Particle Edit", ""}, - {OB_MODE_EDIT_GPENCIL, + {OB_MODE_EDIT_GPENCIL_LEGACY, "EDIT_GPENCIL", ICON_EDITMODE_HLT, "Edit Mode", "Edit Grease Pencil Strokes"}, - {OB_MODE_SCULPT_GPENCIL, + {OB_MODE_SCULPT_GPENCIL_LEGACY, "SCULPT_GPENCIL", ICON_SCULPTMODE_HLT, "Sculpt Mode", "Sculpt Grease Pencil Strokes"}, - {OB_MODE_PAINT_GPENCIL, + {OB_MODE_PAINT_GPENCIL_LEGACY, "PAINT_GPENCIL", ICON_GREASEPENCIL, "Draw Mode", "Paint Grease Pencil Strokes"}, - {OB_MODE_WEIGHT_GPENCIL, + {OB_MODE_WEIGHT_GPENCIL_LEGACY, "WEIGHT_GPENCIL", ICON_WPAINT_HLT, "Weight Paint", "Grease Pencil Weight Paint Strokes"}, - {OB_MODE_VERTEX_GPENCIL, + {OB_MODE_VERTEX_GPENCIL_LEGACY, "VERTEX_GPENCIL", ICON_VPAINT_HLT, "Vertex Paint", @@ -98,27 +98,27 @@ const EnumPropertyItem rna_enum_workspace_object_mode_items[] = { {OB_MODE_WEIGHT_PAINT, "WEIGHT_PAINT", ICON_WPAINT_HLT, "Weight Paint", ""}, {OB_MODE_TEXTURE_PAINT, "TEXTURE_PAINT", ICON_TPAINT_HLT, "Texture Paint", ""}, {OB_MODE_PARTICLE_EDIT, "PARTICLE_EDIT", ICON_PARTICLEMODE, "Particle Edit", ""}, - {OB_MODE_EDIT_GPENCIL, + {OB_MODE_EDIT_GPENCIL_LEGACY, "EDIT_GPENCIL", ICON_EDITMODE_HLT, "Grease Pencil Edit Mode", "Edit Grease Pencil Strokes"}, - {OB_MODE_SCULPT_GPENCIL, + {OB_MODE_SCULPT_GPENCIL_LEGACY, "SCULPT_GPENCIL", ICON_SCULPTMODE_HLT, "Grease Pencil Sculpt Mode", "Sculpt Grease Pencil Strokes"}, - {OB_MODE_PAINT_GPENCIL, + {OB_MODE_PAINT_GPENCIL_LEGACY, "PAINT_GPENCIL", ICON_GREASEPENCIL, "Grease Pencil Draw", "Paint Grease Pencil Strokes"}, - {OB_MODE_VERTEX_GPENCIL, + {OB_MODE_VERTEX_GPENCIL_LEGACY, "VERTEX_GPENCIL", ICON_VPAINT_HLT, "Grease Pencil Vertex Paint", "Grease Pencil Vertex Paint Strokes"}, - {OB_MODE_WEIGHT_GPENCIL, + {OB_MODE_WEIGHT_GPENCIL_LEGACY, "WEIGHT_GPENCIL", ICON_WPAINT_HLT, "Grease Pencil Weight Paint", diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.cc b/source/blender/makesrna/intern/rna_sculpt_paint.cc index e35a89eb7cc..3173a085bfd 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.cc +++ b/source/blender/makesrna/intern/rna_sculpt_paint.cc @@ -345,25 +345,25 @@ static bool rna_Brush_mode_with_tool_poll(PointerRNA *ptr, PointerRNA value) if (slot_index != brush->gpencil_tool) { return false; } - mode = OB_MODE_PAINT_GPENCIL; + mode = OB_MODE_PAINT_GPENCIL_LEGACY; } else if (paint_contains_brush_slot(&ts->gp_vertexpaint->paint, tslot, &slot_index)) { if (slot_index != brush->gpencil_vertex_tool) { return false; } - mode = OB_MODE_VERTEX_GPENCIL; + mode = OB_MODE_VERTEX_GPENCIL_LEGACY; } else if (paint_contains_brush_slot(&ts->gp_sculptpaint->paint, tslot, &slot_index)) { if (slot_index != brush->gpencil_sculpt_tool) { return false; } - mode = OB_MODE_SCULPT_GPENCIL; + mode = OB_MODE_SCULPT_GPENCIL_LEGACY; } else if (paint_contains_brush_slot(&ts->gp_weightpaint->paint, tslot, &slot_index)) { if (slot_index != brush->gpencil_weight_tool) { return false; } - mode = OB_MODE_WEIGHT_GPENCIL; + mode = OB_MODE_WEIGHT_GPENCIL_LEGACY; } else if (paint_contains_brush_slot(&ts->curves_sculpt->paint, tslot, &slot_index)) { if (slot_index != brush->curves_sculpt_tool) { diff --git a/source/blender/windowmanager/intern/wm_keymap_utils.c b/source/blender/windowmanager/intern/wm_keymap_utils.c index 943500b9fc1..d68ee75499d 100644 --- a/source/blender/windowmanager/intern/wm_keymap_utils.c +++ b/source/blender/windowmanager/intern/wm_keymap_utils.c @@ -133,19 +133,19 @@ wmKeyMap *WM_keymap_guess_from_context(const bContext *C) case CTX_MODE_OBJECT: km_id = "Object Mode"; break; - case CTX_MODE_PAINT_GPENCIL: + case CTX_MODE_PAINT_GPENCIL_LEGACY: km_id = "Grease Pencil Stroke Paint Mode"; break; case CTX_MODE_EDIT_GPENCIL_LEGACY: km_id = "Grease Pencil Stroke Edit Mode"; break; - case CTX_MODE_SCULPT_GPENCIL: + case CTX_MODE_SCULPT_GPENCIL_LEGACY: km_id = "Grease Pencil Stroke Sculpt Mode"; break; - case CTX_MODE_WEIGHT_GPENCIL: + case CTX_MODE_WEIGHT_GPENCIL_LEGACY: km_id = "Grease Pencil Stroke Weight Mode"; break; - case CTX_MODE_VERTEX_GPENCIL: + case CTX_MODE_VERTEX_GPENCIL_LEGACY: km_id = "Grease Pencil Stroke Vertex Mode"; break; case CTX_MODE_SCULPT_CURVES: diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c index 3f92a8c479b..15b42c5576c 100644 --- a/source/blender/windowmanager/intern/wm_toolsystem.c +++ b/source/blender/windowmanager/intern/wm_toolsystem.c @@ -717,13 +717,13 @@ static const char *toolsystem_default_tool(const bToolKey *tkey) case CTX_MODE_PAINT_VERTEX: case CTX_MODE_PAINT_WEIGHT: case CTX_MODE_PAINT_TEXTURE: - case CTX_MODE_PAINT_GPENCIL: + case CTX_MODE_PAINT_GPENCIL_LEGACY: return "builtin_brush.Draw"; - case CTX_MODE_SCULPT_GPENCIL: + case CTX_MODE_SCULPT_GPENCIL_LEGACY: return "builtin_brush.Push"; - case CTX_MODE_WEIGHT_GPENCIL: + case CTX_MODE_WEIGHT_GPENCIL_LEGACY: return "builtin_brush.Weight"; - case CTX_MODE_VERTEX_GPENCIL: + case CTX_MODE_VERTEX_GPENCIL_LEGACY: return "builtin_brush.Draw"; case CTX_MODE_SCULPT_CURVES: return "builtin_brush.Density";