diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2014-05-10 03:05:23 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2014-05-10 03:05:23 +0400 |
| commit | d5588fd658dc0c776a33e55ccbfaed1a3974b396 (patch) | |
| tree | c358af7641c242b33de81ccbd5c05c23d9592110 /source/gameengine | |
| parent | 087bbe624f6e0de50c409866faa8fce4585808c0 (diff) | |
Fix T40113: Skinned meshes with non-animated shape keys crashes the BGE.
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Converter/BL_ShapeDeformer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |