mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 16:12:57 +08:00
Merge branch 'master' into skin-size-editing
This commit is contained in:
commit
8d7539ab70
@ -406,7 +406,14 @@ namespace osu.Game.Overlays.SkinEditor
|
|||||||
cp.Colour = colours.Yellow;
|
cp.Colour = colours.Yellow;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
changeHandler?.Dispose();
|
||||||
|
|
||||||
skins.EnsureMutableSkin();
|
skins.EnsureMutableSkin();
|
||||||
|
|
||||||
|
var targetContainer = getTarget(selectedTarget.Value);
|
||||||
|
|
||||||
|
if (targetContainer != null)
|
||||||
|
changeHandler = new SkinEditorChangeHandler(targetContainer);
|
||||||
hasBegunMutating = true;
|
hasBegunMutating = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user