[Bf-blender-cvs] [84e8cab] master: Fix T40697: Skinned meshes with shapekeys crashing in the BGE

[Mitchell Stokes]

Commit: 84e8cabac604a59b7abe4cce37df02d6ef12a0bf
Author: Mitchell Stokes
Date:   Thu Jun 19 18:20:56 2014 -0700
https://developer.blender.org/rB84e8cabac604a59b7abe4cce37df02d6ef12a0bf

Fix T40697: Skinned meshes with shapekeys crashing in the BGE

===================================================================

M	source/gameengine/Ketsji/KX_Scene.cpp

===================================================================

diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index d06b9a0..0dfdb3d 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) {