Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -771,7 +771,6 @@ const char* CShaderMan::mfTemplateTexIdToName(int Id)
    default:
        return "Unknown";
    }
-    return "Unknown";
 }

 CTexAnim* CShaderMan::mfReadTexSequence(const char* na, int Flags, [[maybe_unused]] bool bFindOnly)