diff --git a/.pick_status.json b/.pick_status.json
index 06cacabfa7e..525977f95d0 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3654,7 +3654,7 @@
         "description": "mesa: fix color material tracking",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "f6c8ca06f649ae1367f61eca6fb7635862bd5584",
         "notes": null
diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 2bb0543b119..4aa821f20cf 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -552,7 +552,7 @@ static void set_material_flags( struct tnl_program *p )
    p->color_materials = 0;
    p->materials = 0;
 
-   if (p->state->varying_vp_inputs & VERT_BIT_COLOR0) {
+   if (p->state->light_color_material_mask) {
       p->materials =
          p->color_materials = p->state->light_color_material_mask;
    }