I've been running with this change a little while and have noticed some issues. There are times when the clock is in both the master list and the pending list. If I don't remove it from the master list the animations never stop being applied so it remains in the original visual state. I've fixed this with the following change:

void TimeManager::RemoveClock(Clock* clock, bool clearValue)
{
// https://www.noesisengine.com/bugs/view.php?id=2183
// Begin: SPH [2021-11-09] Ensure we detect pending master clocks before trying to remove a clock that's already started!
NS_ASSERT(clock->HasControllableRoot());

if (HasPendingAnimations())
{
    // Remove the clock from the pending clocks if it hasn't started yet.
    Vector<Clock*>::Iterator iter = mPendingMasterClocks.Find(clock);
    if (iter != mPendingMasterClocks.End())
    {
        mPendingMasterClocks.Erase(iter);

        // This might not exist in the master clocks, so only run this if we had a valid master clock.
        if (mMasterClocks.Find(clock) != mMasterClocks.End())
        {
            RemoveClocks(clock, clearValue);
        }
        return;
    }
}
// If we get here it must be a master clock
NS_ASSERT(mMasterClocks.Find(clock) != mMasterClocks.End());
// End: SPH [2021-11-09]
RemoveClocks(clock, clearValue);

}

Again, not sure if this is the correct thing to do, but seems to work a little better.

Hi, I wasn't able to reproduce the assert by calling GoToVisualState twice in a frame.
But looking at the code, everytime a master clock is registered, it gets added to both mMasterClocks and mPendingMasterClocks. I don't see how it can be in mPendingMasterClocks and not in mMasterClocks when trying to remove it, so I think it would be enough to just check if it exists in mMasterClocks before removing it (which will remove it from both lists), something like this:

void TimeManager::RemoveClock(Clock* clock, bool clearValue)

{

NS_ASSERT(clock->HasControllableRoot());

if (mMasterClocks.Find(clock) != mMasterClocks.End())

{

RemoveClocks(clock, clearValue);

}

}

Could you please confirm that my code is also working in your game?

Hey Sergio, I've just tested your change and it works great. Much appreciated.

Thanks for the confirmation, I've included the fix for the next release.