Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -1934,7 +1934,6 @@ void CMaterialDialog::OnUpdateProperties(IVariable* var)
    }

    bool bMtlLayersChanged = false;
-    SMaterialLayerResources* pMtlLayerResources = mtl->GetMtlLayerResources();
    int nCurrLayer = -1;

    // Check for shader changes