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/KX_GameObject.cpp')
-rw-r--r--source/gameengine/Ketsji/KX_GameObject.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index 67178803457..6adaea2d6ad 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -111,7 +111,7 @@ KX_GameObject::KX_GameObject(
m_pHitObject(NULL),
m_actionManager(NULL),
m_isDeformable(false)
- #ifdef WITH_PYTHON
+#ifdef WITH_PYTHON
, m_attr_dict(NULL)
#endif
{
@@ -159,6 +159,7 @@ KX_GameObject::~KX_GameObject()
}
if (m_actionManager)
{
+ KX_GetActiveScene()->RemoveAnimatedObject(this);
delete m_actionManager;
}
#ifdef WITH_PYTHON
@@ -355,8 +356,8 @@ BL_ActionManager* KX_GameObject::GetActionManager()
{
// We only want to create an action manager if we need it
if (!m_actionManager)
- m_actionManager = new BL_ActionManager(this);
-
+ { KX_GetActiveScene()->AddAnimatedObject(this); m_actionManager = new BL_ActionManager(this);
+ }
return m_actionManager;
}