summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvil Eye <malusluminis@hotmail.com>2021-12-26 17:09:44 +0000
committerEvil Eye <malusluminis@hotmail.com>2021-12-26 17:09:44 +0000
commitea5bd822c261d3d2e4f48ee243f5e99065a49988 (patch)
tree036b5ba06adfdded8a60e55aeb4a8a2a4983c838
parentd16819a5b05d5489f819f1b2670a842db0b0bd78 (diff)
parent9b2978f14390ad3a6fbd112d8ceee34d10042a2b (diff)
Merge branch 'rehashrehashing' into 'master'
Rehash morph loading rehashing See merge request OpenMW/openmw!1509
-rw-r--r--components/nif/nifkey.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/nif/nifkey.hpp b/components/nif/nifkey.hpp
index f1b4f94d00..7736ab7ad9 100644
--- a/components/nif/nifkey.hpp
+++ b/components/nif/nifkey.hpp
@@ -101,7 +101,7 @@ struct KeyMapT {
// Re-runs the read function 3 more times.
// When it does that it's reading in a bunch of InterpolationType_Linear keys, not InterpolationType_XYZ.
}
- else if (count != 0 || morph)
+ else if (count != 0)
{
std::stringstream error;
error << "Unhandled interpolation type: " << mInterpolationType;