[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46921] trunk/blender/source/gameengine/ Ketsji/BL_Action.cpp: Fix for [#31276] Action Actuator, Priorities higher than 1 break Playback:

[Mitchell Stokes]

Revision: 46921
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46921
Author:   moguri
Date:     2012-05-23 04:01:05 +0000 (Wed, 23 May 2012)
Log Message:
-----------
Fix for [#31276] Action Actuator, Priorities higher than 1 break Playback:

The code was looking to see if the priority was strictly greater than the current priority, but it seems that an equal priority should also override (at least the report seems to suggest that this is the behavior from 2.49).

Modified Paths:
--------------
    trunk/blender/source/gameengine/Ketsji/BL_Action.cpp

Modified: trunk/blender/source/gameengine/Ketsji/BL_Action.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/BL_Action.cpp	2012-05-23 03:49:42 UTC (rev 46920)
+++ trunk/blender/source/gameengine/Ketsji/BL_Action.cpp	2012-05-23 04:01:05 UTC (rev 46921)
@@ -127,7 +127,7 @@
 
 	// Only start playing a new action if we're done, or if
 	// the new action has a higher priority
-	if (priority != 0 && !IsDone() && priority >= m_priority)
+	if (!IsDone() && priority > m_priority)
 		return false;
 	m_priority = priority;
 	bAction* prev_action = m_action;