[Bf-blender-cvs] [d6a741ae838] temp-T96709-painting-target: Remove 'sculpt vertex mode' shading mode switch.

[Jeroen Bakker]

Commit: d6a741ae8389ffc14b0e16a0a792603e9f672467
Author: Jeroen Bakker
Date:   Wed Apr 6 10:50:15 2022 +0200
Branches: temp-T96709-painting-target
https://developer.blender.org/rBd6a741ae8389ffc14b0e16a0a792603e9f672467

Remove 'sculpt vertex mode' shading mode switch.

===================================================================

M	source/blender/editors/sculpt_paint/paint_canvas.cc
M	source/blender/editors/sculpt_paint/sculpt.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/paint_canvas.cc b/source/blender/editors/sculpt_paint/paint_canvas.cc
index f66b36013a7..25089387b3d 100644
--- a/source/blender/editors/sculpt_paint/paint_canvas.cc
+++ b/source/blender/editors/sculpt_paint/paint_canvas.cc
@@ -47,8 +47,7 @@ using namespace blender::ed::sculpt_paint::canvas;
 /* Does the paint tool with the given idname uses a canvas. */
 static bool paint_tool_uses_canvas(StringRef idname)
 {
-  /* TODO(jbakker): complete this list. */
-  return ELEM(idname, "builtin_brush.Paint", "builtin.color_filter");
+  return ELEM(idname, "builtin_brush.Paint", "builtin_brush.Smear", "builtin.color_filter");
 }
 
 static bool paint_tool_shading_color_follows_last_used(StringRef idname)
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index f9d7af80998..b4f731402cb 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -5192,14 +5192,6 @@ static bool sculpt_stroke_test_start(bContext *C, struct wmOperator *op, const f
     Object *ob = CTX_data_active_object(C);
     SculptSession *ss = ob->sculpt;
     Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
-    Brush *brush = BKE_paint_brush(&sd->paint);
-
-    if (brush && SCULPT_TOOL_NEEDS_COLOR(brush->sculpt_tool)) {
-      View3D *v3d = CTX_wm_view3d(C);
-      if (v3d) {
-        v3d->shading.color_type = V3D_SHADING_VERTEX_COLOR;
-      }
-    }
 
     ED_view3d_init_mats_rv3d(ob, CTX_wm_region_view3d(C));