Skip to content

Commit 2ecdefc

Browse files
amylouise@unity3d.comamylouise@unity3d.com
authored andcommitted
Merge branch 'master' into uni-9224-docs-pb5
# Conflicts: # CHANGELOG.md
2 parents d435362 + 1eada28 commit 2ecdefc

7 files changed

Lines changed: 386 additions & 35 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
77

88
## [5.0.0-pre.11] - 2021-02-25
99

10+
### Changed
11+
12+
* Updated documentation for v5.0.0.
13+
1014
### Bug Fixes
1115

1216
- [case: 1317148] Fixing edge picking problem with some Unity versions.
@@ -22,6 +26,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
2226
- Added Point-to-point Cut tool.
2327
- Added a selection preview when using the Select Path tool.
2428
- Added `Selection X Ray` option to highlight occluded element selections with a muted color. Default shortcut is `Alt + Shift + X` (modifiable in Shortcut Manager).
29+
- MergeElements.Merge moved to public API
30+
- Added Analytics for Actions and Menu Shortcuts
2531

2632
### Bug Fixes
2733
- [case: 1304442] Update package description for SRPs : warning to users to add samples projects.

Debug/Editor/GenerateMenuItems.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,10 @@ static void AppendMenuItem(StringBuilder sb, MenuActionData data)
179179
// *Important* The `instance.enabled` check is redundant for MenuItems, but not for ShortcutManager
180180
// shortcuts, which atm only have the context of what EditorWindow is active.
181181
sb.AppendLine( "\t\t\tif(instance != null && instance.enabled)");
182+
sb.AppendLine( "\t\t\t{");
182183
sb.AppendLine( "\t\t\t\tEditorUtility.ShowNotification(instance.PerformAction().notification);");
184+
sb.AppendLine( "\t\t\t\tProBuilderAnalytics.SendActionEvent(instance, ProBuilderAnalytics.TriggerType.MenuOrShortcut);");
185+
sb.AppendLine( "\t\t\t}");
183186
sb.AppendLine( "\t\t}");
184187
}
185188

0 commit comments

Comments
 (0)