Merge branch 'master' into skin--completion

This commit is contained in:
Dan Balasescu
2018-03-22 16:39:08 +09:00
committed by Dean Herbert
26 changed files with 139 additions and 112 deletions

View File

@ -106,7 +106,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
{
base.SkinChanged(skin, allowFallback);
if (HitObject is IHasComboIndex combo)
if (HitObject is IHasComboInformation combo)
AccentColour = skin.GetComboColour(combo) ?? Color4.White;
}