Merge branch 'master' into kimkulling/introduce_compression

2022-02-07 10:02:51 +01:00
parent eb5a7938e0 ed8612ea35
commit ce61ea56a5
2 changed files with 11 additions and 6 deletions
--- a/code/AssetLib/LWO/LWOAnimation.cpp
+++ b/code/AssetLib/LWO/LWOAnimation.cpp
@@ -83,9 +83,13 @@ AnimResolver::AnimResolver(std::list<Envelope> &_envelopes, double tick) :
        (*it).old_first = 0;
        (*it).old_last = (*it).keys.size() - 1;

-        if ((*it).keys.empty()) continue;
+        if ((*it).keys.empty()) {
+            continue;
+        }
+        if ((int)(*it).type < 1 || (int)(*it).type>EnvelopeType_Unknown) {
+            continue;
+        }
        switch ((*it).type) {
-
        // translation
        case LWO::EnvelopeType_Position_X:
            trans_x = &*it;