Integrating github/staging through commit 5f214be

This commit is contained in:
alexpete
2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -283,7 +283,7 @@ void AzAssetBrowserRequestHandler::AddContextMenuActions(QWidget* caller, QMenu*
// Add the "Open" menu item.
// Note that source file openers are allowed to "veto" the showing of the "Open" menu if it is 100% known that they aren't openable!
// for example, custom data formats that are made by Lumberyard that can not have a program associated in the operating system to view them.
// for example, custom data formats that are made by Open 3D Engine that can not have a program associated in the operating system to view them.
// If the only opener that can open that file has no m_opener, then it is not openable.
SourceFileOpenerList openers;
AssetBrowserInteractionNotificationBus::Broadcast(&AssetBrowserInteractionNotificationBus::Events::AddSourceFileOpeners, fullFilePath.c_str(), sourceID, openers);
@@ -553,11 +553,11 @@ void AzAssetBrowserRequestHandler::AddSourceFileOpeners(const char* fullSourceFi
if (AZStd::wildcard_match("*.lua", fullSourceFileName))
{
AZStd::string fullName(fullSourceFileName);
// LUA files can be opened with the lumberyard LUA editor.
// LUA files can be opened with the O3DE LUA editor.
openers.push_back(
{
"Lumberyard_LUA_Editor",
"Open in Lumberyard LUA Editor...",
"O3DE_LUA_Editor",
"Open in Open 3D Engine LUA Editor...",
QIcon(),
[](const char* fullSourceFileNameInCallback, const AZ::Uuid& /*sourceUUID*/)
{