Merge branch 'master' into animated-legacy-skins

This commit is contained in:
Dan Balasescu
2019-08-21 13:03:11 +09:00
committed by GitHub
2 changed files with 7 additions and 7 deletions

View File

@ -60,7 +60,7 @@ namespace osu.Game.Skinning
Samples = audioManager.GetSampleStore(storage);
Textures = new TextureStore(new TextureLoaderStore(storage));
using (var testStream = storage.GetStream("hitcircle"))
using (var testStream = storage.GetStream("hitcircle@2x") ?? storage.GetStream("hitcircle"))
hasHitCircle |= testStream != null;
if (hasHitCircle)