epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

32bpp assets dont need a palette to be defined.

Browse Source
This commit is contained in:
Andre Mohren
2021-06-11 12:57:56 +02:00
committed by reaperrr
parent b3b10729cd
commit 62207313a0
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Graphics/WorldRenderer.cs
View File

@@ -85,7 +85,13 @@ namespace OpenRA.Graphics
return new PaletteReference(name, palette.GetPaletteIndex(name), pal, palette); return new PaletteReference(name, palette.GetPaletteIndex(name), pal, palette);
} }
public PaletteReference Palette(string name) { return palettes.GetOrAdd(name, createPaletteReference); } public PaletteReference Palette(string name)
{
// HACK: This is working around the fact that palettes are defined on traits rather than sequences
// and can be removed once this has been fixed.
return name == null ? null : palettes.GetOrAdd(name, createPaletteReference);
}
public void AddPalette(string name, ImmutablePalette pal, bool allowModifiers = false, bool allowOverwrite = false) public void AddPalette(string name, ImmutablePalette pal, bool allowModifiers = false, bool allowOverwrite = false)
{ {
if (allowOverwrite && palette.Contains(name)) if (allowOverwrite && palette.Contains(name))