Merge remote-tracking branch 'origin/master'

This commit is contained in:
NathanSweet 2016-02-22 10:17:51 +01:00
commit 18e0dc35b1

View File

@ -93,7 +93,6 @@ public class SkeletonGraphicInspector : Editor {
#endregion
#region Menus
// Add a menu item called "Double Mass" to a Rigidbody's context menu.
[MenuItem ("CONTEXT/SkeletonGraphic/Match RectTransform with Mesh Bounds")]
static void MatchRectTransformWithBounds (MenuCommand command) {
var skeletonGraphic = (SkeletonGraphic)command.context;
@ -207,4 +206,4 @@ public class SkeletonGraphicInspector : Editor {
}
#endregion
#endif
}
}