diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2011-07-03 05:59:17 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2011-07-03 05:59:17 +0400 |
| commit | 5f4f75c51a511f4f190c16eedfc4c04c3b9aa387 (patch) | |
| tree | 9c226d26639fdeb1c4b546183f4178979e7b93cb /source/gameengine/Ketsji/BL_ActionManager.cpp | |
| parent | 8c3f2923fdc0626d4c2e7f6307c1ec4fd0e8c7f3 (diff) | |
BGE Animations: Adding in layer weights to allow for layer blending.
Diffstat (limited to 'source/gameengine/Ketsji/BL_ActionManager.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/BL_ActionManager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/gameengine/Ketsji/BL_ActionManager.cpp b/source/gameengine/Ketsji/BL_ActionManager.cpp index 096235eeb99..8d862c38961 100644 --- a/source/gameengine/Ketsji/BL_ActionManager.cpp +++ b/source/gameengine/Ketsji/BL_ActionManager.cpp @@ -63,14 +63,14 @@ bool BL_ActionManager::PlayAction(const char* name, short priority, float blendin, short play_mode, - short blend_mode, + float layer_weight, short ipo_flags, float playback_speed) { // Disable layer blending on the first layer - if (layer == 0) blend_mode = BL_Action::ACT_BLEND_NONE; + if (layer == 0) layer_weight = -1.f; - return m_layers[layer]->Play(name, start, end, priority, blendin, play_mode, blend_mode, ipo_flags, playback_speed); + return m_layers[layer]->Play(name, start, end, priority, blendin, play_mode, layer_weight, ipo_flags, playback_speed); } void BL_ActionManager::StopAction(short layer) |