From d5588fd658dc0c776a33e55ccbfaed1a3974b396 Mon Sep 17 00:00:00 2001 From: Mitchell Stokes Date: Fri, 9 May 2014 16:05:23 -0700 Subject: Fix T40113: Skinned meshes with non-animated shape keys crashes the BGE. --- source/gameengine/Converter/BL_ShapeDeformer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/gameengine') diff --git a/source/gameengine/Converter/BL_ShapeDeformer.cpp b/source/gameengine/Converter/BL_ShapeDeformer.cpp index b9b2732276e..5e31dabfab1 100644 --- a/source/gameengine/Converter/BL_ShapeDeformer.cpp +++ b/source/gameengine/Converter/BL_ShapeDeformer.cpp @@ -129,7 +129,7 @@ bool BL_ShapeDeformer::LoadShapeDrivers(KX_GameObject* parent) } // Fix drivers since BL_ArmatureObject makes copies - if (parent->GetGameObjectType() == SCA_IObject::OBJ_ARMATURE) { + if (parent->GetGameObjectType() == SCA_IObject::OBJ_ARMATURE && GetKey()->adt) { BL_ArmatureObject *arma = (BL_ArmatureObject*)parent; FCurve *fcu; -- cgit v1.2.3