Integrating github/staging through commit ab87ed9

Code/Sandbox/Editor/Material/Material.cpp

@@ -1199,8 +1199,6 @@ bool CMaterial::IsBreakable2D() const
         return false;
     }
 
-    int result = 0;
-
     const QString& surfaceTypeName = GetSurfaceTypeName();
     if (ISurfaceTypeManager* pSurfaceManager = GetIEditor()->Get3DEngine()->GetMaterialManager()->GetSurfaceTypeManager())
     {

Code/Sandbox/Editor/Material/MaterialBrowser.cpp

@@ -120,7 +120,7 @@ MaterialBrowserWidget::MaterialBrowserWidget(QWidget* parent)
     connect(m_ui->treeView, &QWidget::customContextMenuRequested, this, [=](const QPoint& point)
         {
             CMaterialBrowserRecord record;
-            bool found = TryGetSelectedRecord(record);
+            TryGetSelectedRecord(record);
             ShowContextMenu(record, point);
         });
 
@@ -417,8 +417,6 @@ void MaterialBrowserWidget::SelectItem(IDataBaseItem* pItem, [[maybe_unused]] ID
         return;
     }
 
-    bool bFound = false;
-
     _smart_ptr<CMaterial> material = static_cast<CMaterial*>(pItem);
     SetSelectedItem(material, 0, true);
 }

Code/Sandbox/Editor/Material/MaterialDialog.cpp

@@ -1934,7 +1934,6 @@ void CMaterialDialog::OnUpdateProperties(IVariable* var)
     }
 
     bool bMtlLayersChanged = false;
-    SMaterialLayerResources* pMtlLayerResources = mtl->GetMtlLayerResources();
     int nCurrLayer = -1;
 
     // Check for shader changes

Code/Sandbox/Editor/Material/MaterialManager.cpp

@@ -537,7 +537,7 @@ void CMaterialManager::ReloadDirtyMaterials()
 
         allMaterials.reserve(mtlCount);
 
-        uint32 mtlCountPrev = mtlCount;
+        [[maybe_unused]] uint32 mtlCountPrev = mtlCount;
         runtimeMaterialManager->GetLoadedMaterials(&allMaterials, mtlCount);
         AZ_Assert(mtlCountPrev == mtlCount && mtlCount == allMaterials.size(), "It appears GetLoadedMaterials was not used correctly.");
 

Code/Sandbox/Editor/Material/MaterialPythonFuncs.cpp

@@ -1353,9 +1353,9 @@ namespace
                 }
                 else
                 {
-                    uint16 nSlot = aznumeric_cast<uint16>(TryConvertingCStringToEEfResTextures(subCategoryName));
                     AZ_Warning("ShadersSystem", false, "PyGetProperty - Error: empty 'subCategoryName' texture slot [%d] for material %s",
-                        nSlot, pMaterial->GetName().toStdString().c_str());
+                        aznumeric_cast<uint16>(TryConvertingCStringToEEfResTextures(subCategoryName)),
+                        pMaterial->GetName().toStdString().c_str());
                 }
             }
             // ########## Texture Maps / [Tiling | Rotator | Oscillator] ##########
@@ -1485,9 +1485,9 @@ namespace
                 }
                 else
                 {
-                    uint16 nSlot = aznumeric_cast<uint16>(TryConvertingCStringToEEfResTextures(subSubCategoryName));
                     AZ_Warning("ShadersSystem", false, "PyGetProperty - Error: empty 'subSubCategoryName' texture slot [%d] for material %s",
-                        nSlot, pMaterial->GetName().toStdString().c_str());
+                        aznumeric_cast<uint16>(TryConvertingCStringToEEfResTextures(subSubCategoryName)),
+                        pMaterial->GetName().toStdString().c_str());
                 }
             }
             else