Merge branch 'main' into Prefab/CreatePrefab

This commit is contained in:
srikappa
2021-04-15 11:08:27 -07:00
174 changed files with 160 additions and 14790 deletions
@@ -65,7 +65,7 @@ namespace AzToolsFramework
if (!contextMenu.m_menu->isEmpty())
{
contextMenu.m_menu->popup(QCursor::pos());
contextMenu.m_menu->exec(QCursor::pos());
}
}
}