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

Windows and Linux compiling

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-23 14:02:45 -07:00
parent 23f99aeb94
commit 31addc43dc
23 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/ColorPicker/PaletteCardCollection.cpp
+1 -1
View File
@@ -208,7 +208,7 @@ namespace AzQtComponents
QString PaletteCardCollection::uniquePaletteName(QSharedPointer<PaletteCard> card, const QString& name) const
{
const auto paletteNameExists = [this, card](const QString& name)
const auto paletteNameExists = [this](const QString& name)
{
auto it = std::find_if(m_paletteCards.begin(), m_paletteCards.end(),
[&name](QSharedPointer<const PaletteCard> card)
Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserFilterModel.cpp
+2 -2
View File
@@ -134,7 +134,7 @@ namespace AzToolsFramework
{
const auto& subFilters = compFilter->GetSubFilters();
const auto& compFilterIter = AZStd::find_if(subFilters.cbegin(), subFilters.cend(),
[subFilters](FilterConstType filter) -> bool
[](FilterConstType filter) -> bool
{
const auto assetTypeFilter = qobject_cast<QSharedPointer<const CompositeFilter>>(filter);
return !assetTypeFilter.isNull();
@@ -146,7 +146,7 @@ namespace AzToolsFramework
}
const auto& compositeStringFilterIter = AZStd::find_if(subFilters.cbegin(), subFilters.cend(),
[subFilters](FilterConstType filter) -> bool
[](FilterConstType filter) -> bool
{
// The real StringFilter is really a CompositeFilter with just one StringFilter in its subfilter list
// To know if it is actually a StringFilter we have to get that subfilter and check if it is a Stringfilter.
Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceUtilities.cpp
+1 -1
View File
@@ -4094,7 +4094,7 @@ namespace AzToolsFramework
using SCCommandBus = AzToolsFramework::SourceControlCommandBus;
SCCommandBus::Broadcast(&SCCommandBus::Events::RequestEdit, fullFilePath.c_str(), true,
[sliceEntity, fullFilePath, tmpFileName, tmpFilesaved](bool /*success*/, const AzToolsFramework::SourceControlFileInfo& info)
[fullFilePath, tmpFileName, tmpFilesaved](bool /*success*/, const AzToolsFramework::SourceControlFileInfo& info)
{
if (!info.IsReadOnly())
{
Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstantiateTests.cpp
+2 -1
View File
@@ -33,7 +33,8 @@ namespace UnitTest
CompareInstances(*firstInstance, *secondInstance, true, false);
}
TEST_F(PrefabInstantiateTest, PrefabInstantiate_TripleNestingTemplate_InstantiateSucceeds)
// TODO: Issue #3398 will re-enable
TEST_F(PrefabInstantiateTest, DISABLED_PrefabInstantiate_TripleNestingTemplate_InstantiateSucceeds)
{
AZ::Entity* newEntity = CreateEntity("New Entity");
AzToolsFramework::EditorEntityContextRequestBus::Broadcast(