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
@@ -1199,8 +1199,6 @@ bool CMaterial::IsBreakable2D() const
        return false;
    }

-    int result = 0;
-
    const QString& surfaceTypeName = GetSurfaceTypeName();
    if (ISurfaceTypeManager* pSurfaceManager = GetIEditor()->Get3DEngine()->GetMaterialManager()->GetSurfaceTypeManager())
    {