diff options
| author | Porteries Tristan <republicthunderbolt9@gmail.com> | 2015-10-28 16:30:52 +0300 |
|---|---|---|
| committer | Porteries Tristan <republicthunderbolt9@gmail.com> | 2015-10-28 17:13:12 +0300 |
| commit | f10db730bc4d8139e86ce078dd0fdd9fd07a8f35 (patch) | |
| tree | 7fcfc82905b9b084c59c3c79be9e063318f189a2 /source/gameengine/Ketsji/BL_Action.h | |
| parent | e0c60985b64cf112cb782f6378552d5fc83f0f65 (diff) | |
BGE: Fix T45945: Action bouncing.
Bug introduced in 583fa7d1e, KX_GameObject.setActionFrame can make BL_Action::m_starttime negative. But in BL_Action::Update m_starttime is set to the current time if it's negative.
To fix it we use a boolean BL_Action::m_initializedTime to know if we should initialize the time in BL_Action::Update, it's more stable than comparing times.
Tested with bug task T45945 and T32054, with an extra patch about to fix suspend resume scene issues with actions : D1569
Diffstat (limited to 'source/gameengine/Ketsji/BL_Action.h')
| -rw-r--r-- | source/gameengine/Ketsji/BL_Action.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/BL_Action.h b/source/gameengine/Ketsji/BL_Action.h index f41b2ef9460..f4c2975a547 100644 --- a/source/gameengine/Ketsji/BL_Action.h +++ b/source/gameengine/Ketsji/BL_Action.h @@ -69,6 +69,8 @@ private: bool m_done; bool m_calc_localtime; + /// Set to true when m_starttime is initialized in Update. + bool m_initializedTime; void ClearControllerList(); void InitIPO(); |