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

Integrating latest 47acbe8

Browse Source
This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/Material/MaterialDialog.cpp
+2 -2
View File
@@ -1342,7 +1342,7 @@ CMaterialDialog::CMaterialDialog(QWidget* parent /* = 0 */)
GetIEditor()->RegisterNotifyListener(this);
m_pMatManager->AddListener(this);
m_propsCtrl->SetUndoCallback(functor(*this, &CMaterialDialog::OnUndo));
m_propsCtrl->SetUndoCallback(AZStd::bind(&CMaterialDialog::OnUndo, this, AZStd::placeholders::_1));
m_propsCtrl->SetStoreUndoByItems(false);
// KDAB_TODO: hack until we have proper signal coming from the IEDitor
@@ -1899,7 +1899,7 @@ void CMaterialDialog::SelectItem(CBaseLibraryItem* item, bool bForceReload)
UpdateShaderParamsUI(mtl);
//////////////////////////////////////////////////////////////////////////
m_propsCtrl->SetUpdateCallback(functor(*this, &CMaterialDialog::OnUpdateProperties));
m_propsCtrl->SetUpdateCallback(AZStd::bind(&CMaterialDialog::OnUpdateProperties, this, AZStd::placeholders::_1));
m_propsCtrl->EnableUpdateCallback(true);
if (mtl->IsDummy())