Skip to content

Commit 32e4971

Browse files
committed
Merge branch 'staging'
2 parents 3b28217 + 35ae86d commit 32e4971

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

Scripts/Core/InterfaceConnectors/ActionsModuleConnector.cs

+18-11
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,26 @@ public void ConnectInterface(object obj, Transform rayOrigin = null)
2020
{
2121
var evrMenus = evr.m_Menus;
2222

23-
var actions = toolActions.actions;
24-
foreach (var action in actions)
23+
// Delay connecting actions to allow tool / module to initialize first
24+
EditorApplication.delayCall += () =>
2525
{
26-
var actionMenuData = new ActionMenuData()
26+
var actions = toolActions.actions;
27+
if (actions != null)
2728
{
28-
name = action.GetType().Name,
29-
sectionName = ActionMenuItemAttribute.DefaultActionSectionName,
30-
priority = int.MaxValue,
31-
action = action,
32-
};
33-
menuActions.Add(actionMenuData);
34-
}
35-
evrMenus.UpdateAlternateMenuActions();
29+
foreach (var action in actions)
30+
{
31+
var actionMenuData = new ActionMenuData()
32+
{
33+
name = action.GetType().Name,
34+
sectionName = ActionMenuItemAttribute.DefaultActionSectionName,
35+
priority = int.MaxValue,
36+
action = action,
37+
};
38+
menuActions.Add(actionMenuData);
39+
}
40+
evrMenus.UpdateAlternateMenuActions();
41+
}
42+
};
3643
}
3744

3845
var alternateMenu = obj as IAlternateMenu;

Tools/TransformTool/TransformTool.cs

+3
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@ public List<IAction> actions
116116
{
117117
get
118118
{
119+
if (!this.IsSharedUpdater(this))
120+
return null;
121+
119122
if (m_Actions == null)
120123
{
121124
m_Actions = new List<IAction>()

0 commit comments

Comments
 (0)