Merge branch 'master' into kimkulling-patch-2-1

2018-11-20 20:15:44 +01:00
parent 04ee420f63 793694a4b1
commit eba1887d34
2 changed files with 4 additions and 20 deletions
@@ -413,8 +413,9 @@ void MDLImporter::InternReadFile_Quake1() {

 #if 1
        // FIXME: the cast is wrong and cause a warning on clang 5.0
-        // disable thi code for now, fix it later
+        // disable this code for now, fix it later
        ai_assert(false && "Bad pointer cast");
+        pcFirstFrame = nullptr; // Workaround: msvc++ C4703 error
 #else
        BE_NCONST MDL::GroupFrame* pcFrames2 = (BE_NCONST MDL::GroupFrame*)pcFrames;
        pcFirstFrame = (BE_NCONST MDL::SimpleFrame*)(&pcFrames2->time + pcFrames->type);