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>2014-06-20 05:20:56 +0400
committerMitchell Stokes <mogurijin@gmail.com>2014-06-20 05:20:56 +0400
commit84e8cabac604a59b7abe4cce37df02d6ef12a0bf (patch)
tree93fac1ab1d9d79c897ac91b687e4227dd117fd8f
parentd43ba1b33c3b159d8169c5a6a6393eded916074a (diff)
Fix T40697: Skinned meshes with shapekeys crashing in the BGE
-rw-r--r--source/gameengine/Ketsji/KX_Scene.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index d06b9a04eb1..0dfdb3d5f3b 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -1616,7 +1616,7 @@ static void update_anim_thread_func(TaskPool *pool, void *taskdata, int UNUSED(t
gameobj->UpdateActionManager(curtime);
children = gameobj->GetChildren();
- if (gameobj->GetDeformer())
+ if (!gameobj->GetParent() && gameobj->GetDeformer())
gameobj->GetDeformer()->Update();
for (int j=0; j<children->GetCount(); ++j) {