diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-23 16:33:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-23 16:33:11 +0400 |
| commit | 094ab4af034a94402a73c2f661dde600cd3ee334 (patch) | |
| tree | ef142e8f0d16ffd384d17fa32dcb2b48877fcb1d /source/gameengine/Ketsji/BL_Action.cpp | |
| parent | dc907ef876b128c9767394d00dfc719d55ba077e (diff) | |
| parent | 4ea8cb25295d0e61a1fcf1cd16028a3586ed5921 (diff) | |
Merge fixes from trunk into 2.60a tag:v2.60a
svn merge ^/trunk/blender \
-c41113 \
-c41117 \
-c41128 \
-c41132 \
-c41134 \
-c41151 \
-c41152 \
-c41175 \
-c41197 \
-c41203 \
-c41211 \
-c41214 \
-c41219
Diffstat (limited to 'source/gameengine/Ketsji/BL_Action.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/BL_Action.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/gameengine/Ketsji/BL_Action.cpp b/source/gameengine/Ketsji/BL_Action.cpp index 08794042e37..9e8f53ad219 100644 --- a/source/gameengine/Ketsji/BL_Action.cpp +++ b/source/gameengine/Ketsji/BL_Action.cpp @@ -361,9 +361,6 @@ void BL_Action::Update(float curtime) break; } - - if (!m_done) - InitIPO(); } if (m_obj->GetGameObjectType() == SCA_IObject::OBJ_ARMATURE) @@ -446,8 +443,6 @@ void BL_Action::Update(float curtime) obj->SetActiveAction(NULL, 0, curtime); } - - InitIPO(); m_obj->UpdateIPO(m_localtime, m_ipo_flags & ACT_IPOFLAG_CHILD); } } |