AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix WideScreenFilter crash

This commit is contained in:
Phillip Stephens 2020-04-17 15:32:26 -07:00
parent 76f0b57340
commit df75c00203
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/Graphics/Shaders/CColoredQuadFilter.cpp
View File

@ -34,7 +34,7 @@ static boo::ObjToken<boo::IShaderPipeline> SelectPipeline(EFilterType type) {
case EFilterType::Multiply: case EFilterType::Multiply:
return s_MultPipeline; return s_MultPipeline;
default: default:
return {}; return s_AlphaPipeline;
} }
} }

2
Runtime/World/ScriptLoader.cpp
View File

@ -1052,7 +1052,7 @@ CEntity* ScriptLoader::LoadCameraFilterKeyframe(CStateManager& mgr, CInputStream
color.readRGBABig(in); color.readRGBABig(in);
float timeIn = in.readFloatBig(); float timeIn = in.readFloatBig();
float timeOut = in.readFloatBig(); float timeOut = in.readFloatBig();
CAssetId txtr = in.readUint32Big(); CAssetId txtr(in);
return new CScriptCameraFilterKeyframe(mgr.AllocateUniqueId(), name, info, ftype, shape, filterIdx, unk, color, return new CScriptCameraFilterKeyframe(mgr.AllocateUniqueId(), name, info, ftype, shape, filterIdx, unk, color,
timeIn, timeOut, txtr, active); timeIn, timeOut, txtr, active);