birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

other gems

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-20 18:02:08 -07:00
parent 323d642e65
commit 5e9872f7ce
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LandscapeCanvas/Code/Source/Editor/MainWindow.cpp
+4 -4
View File
@@ -955,14 +955,14 @@ namespace LandscapeCanvasEditor
auto redoAction = new QAction(QObject::tr("&Redo"), this);
redoAction->setShortcut(AzQtComponents::RedoKeySequence);
QObject::connect(redoAction, &QAction::triggered, [this] {
QObject::connect(redoAction, &QAction::triggered, [] {
GetLegacyEditor()->Redo();
});
menu->insertAction(separatorAction, redoAction);
auto undoAction = new QAction(QObject::tr("&Undo"), this);
undoAction->setShortcut(QKeySequence::Undo);
QObject::connect(undoAction, &QAction::triggered, [this] {
QObject::connect(undoAction, &QAction::triggered, [] {
GetLegacyEditor()->Undo();
});
menu->insertAction(redoAction, undoAction);
@@ -2852,7 +2852,7 @@ namespace LandscapeCanvasEditor
// For any node with an Entity Name slot, we need to replace the string property display with a read-only version
// instead until we have support for listening for GraphModel slot value changes. We need to delay this because
// when the node is added, the slots haven't been added to the element map yet.
QTimer::singleShot(0, [this, node, graphId]() {
QTimer::singleShot(0, [node, graphId]() {
GraphModel::SlotPtr slot = node->GetSlot(LandscapeCanvas::ENTITY_NAME_SLOT_ID);
if (slot)
{
@@ -2976,7 +2976,7 @@ namespace LandscapeCanvasEditor
AzToolsFramework::EntityIdList vegetationAreaIds;
m_serializeContext->EnumerateObject(component,
// beginElemCB
[this, &previewEntityId, &inboundShapeEntityId, &gradientSamplerIds, &vegetationAreaIds](void *instance, [[maybe_unused]] const AZ::SerializeContext::ClassData *classData, const AZ::SerializeContext::ClassElement *classElement) -> bool
[&previewEntityId, &inboundShapeEntityId, &gradientSamplerIds, &vegetationAreaIds](void *instance, [[maybe_unused]] const AZ::SerializeContext::ClassData *classData, const AZ::SerializeContext::ClassElement *classElement) -> bool
{
if (classElement && (classElement->m_typeId == azrtti_typeid<AZ::EntityId>()))
{
Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/DependencyBuilderWorker.cpp
+1 -2
View File
@@ -12,9 +12,8 @@
namespace DependencyBuilder
{
DependencyBuilderWorker::DependencyBuilderWorker(AZStd::string jobKey, bool critical)
DependencyBuilderWorker::DependencyBuilderWorker(AZStd::string jobKey, [[maybe_unused]] bool critical)
: m_jobKey(jobKey)
, m_critical(critical)
{
}
Gems/LmbrCentral/Code/Source/Builders/DependencyBuilder/DependencyBuilderWorker.h
-1
View File
@@ -38,7 +38,6 @@ namespace DependencyBuilder
private:
AZStd::string m_jobKey;
bool m_critical = false;
bool m_isShuttingDown = false;
};
}
Gems/LyShine/Code/Editor/ComponentHelpers.cpp
+1 -1
View File
@@ -764,7 +764,7 @@ namespace ComponentHelpers
QObject::connect(action,
&QAction::triggered,
hierarchy,
[serializeContext, hierarchy, componentClass, items]([[maybe_unused]] bool checked)
[hierarchy, componentClass, items]([[maybe_unused]] bool checked)
{
EBUS_EVENT(UiEditorInternalNotificationBus, OnBeginUndoableEntitiesChange);
Gems/SliceFavorites/Code/Source/FavoriteDataModel.cpp
+1 -1
View File
@@ -562,7 +562,7 @@ namespace SliceFavorites
// Rebuild the menu from the current tree
m_favoritesMenu->clear();
m_favoritesMenu->addAction(QIcon(":/Icons/SliceFavorite_Icon_Manage"), "Manage favorites...", m_favoritesMenu.get(), [this]()
m_favoritesMenu->addAction(QIcon(":/Icons/SliceFavorite_Icon_Manage"), "Manage favorites...", m_favoritesMenu.get(), []()
{
AzToolsFramework::OpenViewPane(SliceFavorites::ManageSliceFavorites);
});