AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 05:07:43 +00:00
Code Issues Projects Releases Wiki Activity

CActorContraption fixes, better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/MP1/CFaceplateDecoration.cpp
View File

@@ -16,13 +16,13 @@ void CFaceplateDecoration::Update(float dt, CStateManager& stateMgr) {
x4_tex.Unlock();
x0_id = txtrId;
if (m_texFilter)
m_texFilter = rstl::nullopt;
m_texFilter = std::nullopt;
}
}
if (x0_id != txtrId && txtrId.IsValid()) {
if (m_texFilter)
m_texFilter = rstl::nullopt;
m_texFilter = std::nullopt;
x0_id = txtrId;
x4_tex = g_SimplePool->GetObj(SObjectTag{FOURCC('TXTR'), txtrId});
xc_ready = true;