diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2014-04-07 03:30:59 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2014-04-07 03:30:59 +0400 |
| commit | fe05f97841c0ee3e2a6e15f2252ad160fefc3509 (patch) | |
| tree | 2a672e5d82448f43471ddb529a95fa547d5c311e /source/gameengine/Converter/BL_ArmatureActuator.cpp | |
| parent | be8b4b8b0c4d4fdeed6ebf88d8a3bd480e4c48ce (diff) | |
BGE: Multi-threading animation updates and skinning.
This required BL_ArmatureObject to have tighter control over armatures and poses.
Also, (Blender) armature objects are now copied instead of shared between
BL_ArmatureObjects to avoid race conditions. Also, due to the armature copy,
shape key drivers need a bit of extra fiddling to get the correct armature copy.
Initially OpenMP was used for threading, but then BLI_task was used due to being
less compiler dependent.
This commit also places time spent on skinning updates in the Animation
profiler category (was previously under the Rasterizer category).
Diffstat (limited to 'source/gameengine/Converter/BL_ArmatureActuator.cpp')
| -rw-r--r-- | source/gameengine/Converter/BL_ArmatureActuator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Converter/BL_ArmatureActuator.cpp b/source/gameengine/Converter/BL_ArmatureActuator.cpp index f0c4b3d32bb..e38cb6eadaf 100644 --- a/source/gameengine/Converter/BL_ArmatureActuator.cpp +++ b/source/gameengine/Converter/BL_ArmatureActuator.cpp @@ -155,7 +155,7 @@ bool BL_ArmatureActuator::Update(double curtime, bool frame) switch (m_type) { case ACT_ARM_RUN: result = true; - obj->SetActiveAction(NULL, 0, curtime); + obj->UpdateTimestep(curtime); break; case ACT_ARM_ENABLE: if (m_constraint) |