Merge branch 'master' into fix-texture-loader-usages

This commit is contained in:
Bartłomiej Dach
2020-12-21 18:35:34 +01:00
committed by GitHub
27 changed files with 378 additions and 152 deletions

View File

@ -303,7 +303,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
samplesBindable.CollectionChanged -= onSamplesChanged;
// Release the samples for other hitobjects to use.
Samples.Samples = null;
if (Samples != null)
Samples.Samples = null;
if (nestedHitObjects.IsValueCreated)
{