Ensure our list of color layer is the same as we use when we rename glyphs

simoncozens · simoncozens · commit b5b0143a8efc · 2024-01-29T12:28:05.000Z
diff --git a/Lib/glyphsLib/builder/components.py b/Lib/glyphsLib/builder/components.py
@@ -58,6 +58,7 @@ def to_ufo_components(self, ufo_glyph, layer):
             component_glyph = font.glyphs[component_name]
             color_layers = [
                 l for l in component_glyph.layers if l._is_color_palette_layer()
+                and l.associatedMasterId == layer.associatedMasterId
             ]
             for i, l in enumerate(color_layers):
                 if l._color_palette_index() == layer._color_palette_index():

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ def to_ufo_components(self, ufo_glyph, layer):`
`58`	`58`	`component_glyph = font.glyphs[component_name]`
`59`	`59`	`color_layers = [`
`60`	`60`	`l for l in component_glyph.layers if l._is_color_palette_layer()`
	`61`	`+ and l.associatedMasterId == layer.associatedMasterId`
`61`	`62`	`]`
`62`	`63`	`for i, l in enumerate(color_layers):`
`63`	`64`	`if l._color_palette_index() == layer._color_palette_index():`