MP1 material fix after MP3 refactor

AxioDL · Nov 17, 2019 · 8ad13ff · 8ad13ff
1 parent dfc9d1d
commit 8ad13ff
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/Core/Resource/CMaterialPass.cpp b/src/Core/Resource/CMaterialPass.cpp
@@ -79,8 +79,8 @@ void CMaterialPass::HashParameters(CFNV1A& rHash)
         rHash.HashLong(mKColorSel);
         rHash.HashLong(mKAlphaSel);
         rHash.HashLong(mRasSel);
-        rHash.HashLong(mTevColorScale);
-        rHash.HashLong(mTevAlphaScale);
+        rHash.HashFloat(mTevColorScale);
+        rHash.HashFloat(mTevAlphaScale);
         rHash.HashLong(mTexCoordSource);
         rHash.HashLong((uint) mAnimMode);
         rHash.HashData(mAnimParams, sizeof(float) * 8);

diff --git a/src/Core/Resource/Factory/CMaterialLoader.cpp b/src/Core/Resource/Factory/CMaterialLoader.cpp
@@ -75,6 +75,7 @@ CMaterial* CMaterialLoader::ReadPrimeMaterial()
 
     // Flags
     pMat->mOptions = (mpFile->ReadLong() & (uint) EMaterialOption::AllMP1Settings);
+    pMat->mOptions.SetFlag(EMaterialOption::ColorWrite);
 
     // Textures
     uint32 NumTextures = mpFile->ReadLong();

diff --git a/src/Core/Resource/Factory/CMaterialLoader.h b/src/Core/Resource/Factory/CMaterialLoader.h
@@ -8,6 +8,8 @@
 #include <Common/FileIO.h>
 #include <assimp/scene.h>
 
+#include <optional>
+
 enum class EMP3RenderConfig
 {
     NoBloomTransparent,