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:
authorMitchell Stokes <mogurijin@gmail.com>2011-06-07 03:35:24 +0400
committerMitchell Stokes <mogurijin@gmail.com>2011-06-07 03:35:24 +0400
commitb9abe6211f258c6f6f967ba2502f92cdc37867c9 (patch)
tree207dbf10cfba2fc7fbdff31693d98af41ecbe7c2 /source/gameengine/Ketsji/BL_Action.cpp
parente18bea1cfce7e8cc1a78e707738164440430f7a9 (diff)
BGE Animations: Removing some redundant pose copies from BL_Action.
Diffstat (limited to 'source/gameengine/Ketsji/BL_Action.cpp')
-rw-r--r--source/gameengine/Ketsji/BL_Action.cpp27
1 files changed, 0 insertions, 27 deletions
diff --git a/source/gameengine/Ketsji/BL_Action.cpp b/source/gameengine/Ketsji/BL_Action.cpp
index 77cb5de1398..512aa962b05 100644
--- a/source/gameengine/Ketsji/BL_Action.cpp
+++ b/source/gameengine/Ketsji/BL_Action.cpp
@@ -187,14 +187,9 @@ void BL_Action::Update(float curtime)
if (m_obj->GetGameObjectType() == SCA_IObject::OBJ_ARMATURE)
{
- bPose* prev_pose = NULL;
BL_ArmatureObject *obj = (BL_ArmatureObject*)m_obj;
obj->GetPose(&m_pose);
- // Save the old pose if we need to do some layer blending
- if (m_blendmode != ACT_BLEND_NONE)
- obj->GetMRDPose(&prev_pose);
-
// Extract the pose from the action
{
struct PointerRNA id_ptr;
@@ -208,17 +203,6 @@ void BL_Action::Update(float curtime)
arm->pose = temp;
}
- // Handle blending between layers
- switch(m_blendmode)
- {
- case ACT_BLEND_MIX:
- game_blend_poses(m_pose, prev_pose, 0.5f);
- break;
- case ACT_BLEND_NONE:
- default:
- break;
- }
-
// Handle blending between actions
if (m_blendin && m_blendframe<m_blendin)
{
@@ -239,21 +223,10 @@ void BL_Action::Update(float curtime)
if (m_blendframe>m_blendin)
m_blendframe = m_blendin;
}
- else
- {
- if (m_blendpose)
- {
- game_free_pose(m_blendpose);
- m_blendpose = NULL;
- }
- }
obj->SetPose(m_pose);
obj->SetActiveAction(NULL, 0, curtime);
-
- if (prev_pose)
- game_free_pose(prev_pose);
}
else
{