[Bf-blender-cvs] [d8282da] master: Correction to last commit

[Mitchell Stokes]

Commit: d8282da5452b9bb8487d9bce611b922244a74a08
Author: Mitchell Stokes
Date:   Mon Apr 28 16:33:26 2014 -0700
https://developer.blender.org/rBd8282da5452b9bb8487d9bce611b922244a74a08

Correction to last commit

===================================================================

M	source/gameengine/Converter/BL_ActionActuator.cpp

===================================================================

diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp b/source/gameengine/Converter/BL_ActionActuator.cpp
index b606cd1..f8c5ffb 100644
--- a/source/gameengine/Converter/BL_ActionActuator.cpp
+++ b/source/gameengine/Converter/BL_ActionActuator.cpp
@@ -254,17 +254,13 @@ bool BL_ActionActuator::Update(double curtime, bool frame)
 	// Handle a finished animation
 	if ((m_flag & ACT_FLAG_PLAY_END) && (m_flag & ACT_FLAG_ACTIVE) && obj->IsActionDone(m_layer))
 	{
+		m_flag &= ~ACT_FLAG_ACTIVE;
+		m_flag &= ~ACT_FLAG_ATTEMPT_PLAY;
+
 		if (m_playtype == ACT_ACTION_PINGPONG)
-		{
 			m_flag ^= ACT_FLAG_REVERSE;
-		}
 		else
-		{
-			m_flag &= ~ACT_FLAG_ACTIVE;
-			m_flag &= ~ACT_FLAG_ATTEMPT_PLAY;
-
 			return false;
-		}
 	}
 	
 	// If a different action is playing, we've been overruled and are no longer active