Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/setup

2021-09-21 09:41:36 -07:00
parent 9d7e5ce1af 04ee676e2f
commit 29d7fcb55e
8 changed files with 188 additions and 137 deletions
@@ -46,7 +46,7 @@ namespace AzToolsFramework

        QModelIndex AssetBrowserTableModel::mapToSource(const QModelIndex& proxyIndex) const
        {
-            Q_ASSERT(!proxyIndex.isValid() || proxyIndex.model() != this);
+            Q_ASSERT(!proxyIndex.isValid() || proxyIndex.model() == this);
            if (!proxyIndex.isValid() || !m_indexMap.contains(proxyIndex.row()))
            {
                return QModelIndex();