Merge branch 'master' into slider-controlpoint-masks

This commit is contained in:
Dean Herbert 2018-11-01 02:37:31 +09:00 committed by GitHub
commit 9cb4374b51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -84,6 +84,8 @@ namespace osu.Game.Rulesets.Edit
switch (e)
{
case ScrollEvent _:
return false;
case MouseEvent _:
return true;
default: