Skip to content

bugfix(W3DModelDraw): Guard setModelState call in replaceIndicatorColor #413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bugfix(W3DModelDraw): Guard setModelState call in replaceIndicatorColor #413

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3213,12 +3213,19 @@ void W3DModelDraw::replaceIndicatorColor(Color color)
{
m_hexColor = newColor;

// set these to nullptr to force a regen of everything in setModelState.
const ModelConditionInfo* tmp = m_curState;
m_curState = nullptr;
m_nextState = nullptr;
m_nextStateAnimLoopDuration = NO_NEXT_DURATION;
setModelState(tmp);
// TheSuperHackers @bugfix Do not call setModelState with a null state pointer, as this
// can happen when replaceIndicatorColor is called before the draw module has been fully
// initialized (e.g. during object creation in friend_bindToObject). In such cases, the
// updated m_hexColor will be picked up on the next proper setModelState call.
if (m_curState != nullptr)
{
// set these to nullptr to force a regen of everything in setModelState.
const ModelConditionInfo* tmp = m_curState;
m_curState = nullptr;
m_nextState = nullptr;
m_nextStateAnimLoopDuration = NO_NEXT_DURATION;
setModelState(tmp);
}
}
}
}
Expand Down
Loading