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:
authorDalai Felinto <dfelinto@gmail.com>2012-08-20 00:45:34 +0400
committerDalai Felinto <dfelinto@gmail.com>2012-08-20 00:45:34 +0400
commit59c8c645c351af4473d869d543b0465225b9f85e (patch)
tree3975399a0f8ef348bab3921aac78339741376f75 /source/gameengine/Ketsji/KX_GameObject.cpp
parent526d0be9bfb727c87281e6edd92ffd4a27a57cbd (diff)
patch/bugfix [#32006] Fix for Collision Sensor - R6025 pure virtual function call crash when deleting objects in overlay scene by Jay Parker(battery) Fix for bug [#30477] Collision Sensor - R6025 pure virtual function call crash
Diffstat (limited to 'source/gameengine/Ketsji/KX_GameObject.cpp')
-rw-r--r--source/gameengine/Ketsji/KX_GameObject.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp
index 04a806dfd92..3818cef7d6e 100644
--- a/source/gameengine/Ketsji/KX_GameObject.cpp
+++ b/source/gameengine/Ketsji/KX_GameObject.cpp
@@ -1688,7 +1688,8 @@ PyObject* KX_GameObject::PyReplaceMesh(PyObject* args)
PyObject* KX_GameObject::PyEndObject()
{
- KX_Scene *scene = KX_GetActiveScene();
+ SG_Node* node = this->GetSGNode();
+ KX_Scene* scene = static_cast<KX_Scene*>(node->GetSGClientInfo());
scene->DelayedRemoveObject(this);