[Bf-blender-cvs] [cfed819761d] temp-T97352-3d-texturing-seam-bleeding: Merge branch 'master' into temp-T97352-3d-texturing-seam-bleeding

[Jeroen Bakker]

Commit: cfed819761d515e8fc8a5e86927c9139b630167c
Author: Jeroen Bakker
Date:   Fri Apr 22 08:35:28 2022 +0200
Branches: temp-T97352-3d-texturing-seam-bleeding
https://developer.blender.org/rBcfed819761d515e8fc8a5e86927c9139b630167c

Merge branch 'master' into temp-T97352-3d-texturing-seam-bleeding

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



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

diff --cc source/blender/draw/engines/workbench/workbench_engine.c
index 60919d0d028,fb20bde2f65..8999ac052ee
--- a/source/blender/draw/engines/workbench/workbench_engine.c
+++ b/source/blender/draw/engines/workbench/workbench_engine.c
@@@ -321,23 -325,23 +325,7 @@@ static eV3DShadingColorType workbench_c
  
    if (is_sculpt_pbvh && color_type == V3D_SHADING_TEXTURE_COLOR) {
      /* Force use of material color for sculpt. */
--    color_type = V3D_SHADING_MATERIAL_COLOR;
--  }
--
--  if (is_sculpt_pbvh) {
--    /* Bad call C is required to access the tool system that is context aware. Cast to non-const
--     * due to current API. */
--    bContext *C = (bContext *)DRW_context_state_get()->evil_C;
--    if (C != NULL) {
--      color_type = ED_paint_shading_color_override(
--          C, &wpd->scene->toolsettings->paint_mode, ob, color_type);
--    }
--  }
--
--  if (r_draw_shadow) {
--    *r_draw_shadow = (ob->dtx & OB_DRAW_NO_SHADOW_CAST) == 0 && SHADOW_ENABLED(wpd);
      /* Currently unsupported in sculpt mode. We could revert to the slow
--     * method in this case but I'm not sure if it's a good idea given that
       * sculpted meshes are heavy to begin with. */
      if (is_sculpt_pbvh) {
        *r_draw_shadow = false;