Sculpting: Remove Show Diffuse Color Option

This should have been removed in 2.80 as the functionality was removed.
This feature now does not do anything and can be removed.

Differential Revision: https://developer.blender.org/D5411

5 files changed, 0 insertions, 15 deletions

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index eb1e8311a12..28bd9c0cea5 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -270,7 +270,6 @@ static PBVH *cdDM_getPBVH(Object *ob, DerivedMesh *dm)
                          ob->sculpt->cd_vert_node_offset,
                          ob->sculpt->cd_face_node_offset);
 
-    pbvh_show_diffuse_color_set(cddm->pbvh, ob->sculpt->show_diffuse_color);
     pbvh_show_mask_set(cddm->pbvh, ob->sculpt->show_mask);
   }
 
@@ -300,7 +299,6 @@ static PBVH *cdDM_getPBVH(Object *ob, DerivedMesh *dm)
                         looptri,
                         looptris_num);
 
-    pbvh_show_diffuse_color_set(cddm->pbvh, ob->sculpt->show_diffuse_color);
     pbvh_show_mask_set(cddm->pbvh, ob->sculpt->show_mask);
 
     deformed = check_sculpt_object_deformed(ob, true);
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 99ae19c3c30..0e93c80ecb5 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -1158,7 +1158,6 @@ static void sculpt_update_object(
   MultiresModifierData *mmd = BKE_sculpt_multires_active(scene, ob);
 
   ss->modifiers_active = sculpt_modifiers_active(scene, sd, ob);
-  ss->show_diffuse_color = (sd->flags & SCULPT_SHOW_DIFFUSE) != 0;
   ss->show_mask = (sd->flags & SCULPT_HIDE_MASK) == 0;
 
   ss->building_vp_handle = false;
@@ -1213,7 +1212,6 @@ static void sculpt_update_object(
         &ss->pmap, &ss->pmap_mem, me->mpoly, me->mloop, me->totvert, me->totpoly, me->totloop);
   }
 
-  pbvh_show_diffuse_color_set(ss->pbvh, ss->show_diffuse_color);
   pbvh_show_mask_set(ss->pbvh, ss->show_mask);
 
   if (ss->modifiers_active) {
@@ -1449,7 +1447,6 @@ static PBVH *build_pbvh_for_dynamic_topology(Object *ob)
                        ob->sculpt->bm_log,
                        ob->sculpt->cd_vert_node_offset,
                        ob->sculpt->cd_face_node_offset);
-  pbvh_show_diffuse_color_set(pbvh, ob->sculpt->show_diffuse_color);
   pbvh_show_mask_set(pbvh, ob->sculpt->show_mask);
   return pbvh;
 }
@@ -1474,7 +1471,6 @@ static PBVH *build_pbvh_from_regular_mesh(Object *ob, Mesh *me_eval_deform)
                       looptri,
                       looptris_num);
 
-  pbvh_show_diffuse_color_set(pbvh, ob->sculpt->show_diffuse_color);
   pbvh_show_mask_set(pbvh, ob->sculpt->show_mask);
 
   const bool is_deformed = check_sculpt_object_deformed(ob, true);
@@ -1500,7 +1496,6 @@ static PBVH *build_pbvh_from_ccg(Object *ob, SubdivCCG *subdiv_ccg)
                        (void **)subdiv_ccg->grid_faces,
                        subdiv_ccg->grid_flag_mats,
                        subdiv_ccg->grid_hidden);
-  pbvh_show_diffuse_color_set(pbvh, ob->sculpt->show_diffuse_color);
   pbvh_show_mask_set(pbvh, ob->sculpt->show_mask);
   return pbvh;
 }
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 860e2bdaa93..64a16a0e3be 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -2501,11 +2501,6 @@ bool pbvh_has_mask(PBVH *bvh)
   return false;
 }
 
-void pbvh_show_diffuse_color_set(PBVH *bvh, bool show_diffuse_color)
-{
-  bvh->show_diffuse_color = !pbvh_has_mask(bvh) || show_diffuse_color;
-}
-
 void pbvh_show_mask_set(PBVH *bvh, bool show_mask)
 {
   bvh->show_mask = show_mask;
diff --git a/source/blender/blenkernel/intern/pbvh_intern.h b/source/blender/blenkernel/intern/pbvh_intern.h
index dc9d796075b..e74a8d43c68 100644
--- a/source/blender/blenkernel/intern/pbvh_intern.h
+++ b/source/blender/blenkernel/intern/pbvh_intern.h
@@ -152,8 +152,6 @@ struct PBVH {
 
   /* flag are verts/faces deformed */
   bool deformed;
-
-  bool show_diffuse_color;
   bool show_mask;
 
   /* Dynamic topology */
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 09a073e3ca6..3f57ae169ff 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -2379,7 +2379,6 @@ static struct PBVH *ccgDM_getPBVH(Object *ob, DerivedMesh *dm)
   }
 
   if (ccgdm->pbvh != NULL) {
-    pbvh_show_diffuse_color_set(ccgdm->pbvh, ob->sculpt->show_diffuse_color);
     pbvh_show_mask_set(ccgdm->pbvh, ob->sculpt->show_mask);
   }