Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration

This commit is contained in:
Dean Herbert
2019-10-21 17:09:43 +09:00
15 changed files with 324 additions and 88 deletions

View File

@ -124,20 +124,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
if (blueprint == null)
return;
if (hitObject.IsLoaded)
addBlueprint();
else
hitObject.OnLoadComplete += _ => addBlueprint();
blueprint.Selected += onBlueprintSelected;
blueprint.Deselected += onBlueprintDeselected;
blueprint.SelectionRequested += onSelectionRequested;
blueprint.DragRequested += onDragRequested;
void addBlueprint()
{
blueprint.Selected += onBlueprintSelected;
blueprint.Deselected += onBlueprintDeselected;
blueprint.SelectionRequested += onSelectionRequested;
blueprint.DragRequested += onDragRequested;
selectionBlueprints.Add(blueprint);
}
selectionBlueprints.Add(blueprint);
}
private void removeBlueprintFor(DrawableHitObject hitObject) => removeBlueprintFor(hitObject.HitObject);