Merge branch 'master' into beatmapskin-interface

This commit is contained in:
Dean Herbert
2020-08-30 12:22:55 +09:00
committed by GitHub
19 changed files with 140 additions and 85 deletions

View File

@ -104,10 +104,6 @@ namespace osu.Game.Beatmaps.Formats
try
{
byte alpha = split.Length == 4 ? byte.Parse(split[3]) : (byte)255;
if (alpha == 0)
alpha = 255;
colour = new Color4(byte.Parse(split[0]), byte.Parse(split[1]), byte.Parse(split[2]), alpha);
}
catch