[Bf-blender-cvs] [89662fa778f] temp-sculpt-colors: temp-sculpt-colors: don't include this particular bug fix in the patch

[Joseph Eagar]

Commit: 89662fa778f541b769d5588c157ba1ec109bd3ae
Author: Joseph Eagar
Date:   Sat Jan 29 12:59:38 2022 -0800
Branches: temp-sculpt-colors
https://developer.blender.org/rB89662fa778f541b769d5588c157ba1ec109bd3ae

temp-sculpt-colors: don't include this particular bug
                    fix in the patch

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

M	release/datafiles/blender_icons_geom.py

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

diff --git a/release/datafiles/blender_icons_geom.py b/release/datafiles/blender_icons_geom.py
index 5411412a2e1..82d4f813062 100644
--- a/release/datafiles/blender_icons_geom.py
+++ b/release/datafiles/blender_icons_geom.py
@@ -118,7 +118,7 @@ def object_child_map(objects):
 
 def mesh_data_lists_from_mesh(me, material_colors):
     me_loops = me.loops[:]
-    me_loops_color = me.vertex_colors.active.data[:] if me.vertex_colors.active else None
+    me_loops_color = me.vertex_colors.active.data[:]
     me_verts = me.vertices[:]
     me_polys = me.polygons[:]
 
@@ -135,12 +135,7 @@ def mesh_data_lists_from_mesh(me, material_colors):
         l_sta = p.loop_start
         l_len = p.loop_total
         loops_poly = me_loops[l_sta:l_sta + l_len]
-
-        if me_loops_color is not None:
-            color_poly = me_loops_color[l_sta:l_sta + l_len]
-        else:
-            color_poly = (1.0, 1.0, 1.0, 1.0)
-
+        color_poly = me_loops_color[l_sta:l_sta + l_len]
         i0 = 0
         i1 = 1