Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/gameengine/Ketsji/BL_ActionManager.cpp')
-rw-r--r--source/gameengine/Ketsji/BL_ActionManager.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/source/gameengine/Ketsji/BL_ActionManager.cpp b/source/gameengine/Ketsji/BL_ActionManager.cpp
index 935e9129d21..9e847b20c9d 100644
--- a/source/gameengine/Ketsji/BL_ActionManager.cpp
+++ b/source/gameengine/Ketsji/BL_ActionManager.cpp
@@ -60,18 +60,14 @@ void BL_ActionManager::PlayAction(const char* name,
float start,
float end,
short layer,
+ short priority,
float blendin,
short play_mode,
short blend_mode,
short ipo_flags,
float playback_speed)
{
- // Remove a currently running action on this layer if there is one
- if (m_layers[layer])
- StopAction(layer);
-
- // Create a new action
- m_layers[layer]->Play(name, start, end, blendin, play_mode, blend_mode, ipo_flags, playback_speed);
+ m_layers[layer]->Play(name, start, end, priority, blendin, play_mode, blend_mode, ipo_flags, playback_speed);
}
void BL_ActionManager::StopAction(short layer)