sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 00:53:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix post-merge conflict

Browse Source
This commit is contained in:
smoogipoo
2018-10-30 16:47:39 +09:00
parent 5712a52817
commit 71b6789136
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/SliderBodyPiece.cs
View File

@ -13,12 +13,12 @@ namespace osu.Game.Rulesets.Osu.Edit.Masks.SliderMasks.Components
public class SliderBodyPiece : CompositeDrawable public class SliderBodyPiece : CompositeDrawable
{ {
private readonly Slider slider; private readonly Slider slider;
private readonly SliderBody body; private readonly SnakingSliderBody body;
public SliderBodyPiece(Slider slider) public SliderBodyPiece(Slider slider)
{ {
this.slider = slider; this.slider = slider;
InternalChild = body = new SliderBody(slider) InternalChild = body = new SnakingSliderBody(slider)
{ {
AccentColour = Color4.Transparent, AccentColour = Color4.Transparent,
PathWidth = slider.Scale * 64 PathWidth = slider.Scale * 64