diff options
| author | Nick Samarin <nicks1987@bigmir.net> | 2010-06-01 03:44:43 +0400 |
|---|---|---|
| committer | Nick Samarin <nicks1987@bigmir.net> | 2010-06-01 03:44:43 +0400 |
| commit | d3d2e92fccc7ed65d753dbf8872b720ffe0fd6ad (patch) | |
| tree | 47e96828bf662ecf9dc1800cce7361ce5fa0dbb6 /source/gameengine/Ketsji/KX_Scene.cpp | |
| parent | 05b92f0fc90b5f2cd5d933f97df20c774b42479f (diff) | |
synched branch with trunk at revision 29109
Diffstat (limited to 'source/gameengine/Ketsji/KX_Scene.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index bfa372018cb..3af3c8a3096 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -1066,12 +1066,12 @@ void KX_Scene::ReplaceMesh(class CValue* obj,void* meshobj, bool use_gfx, bool u bool bHasShapeKey = blendmesh->key != NULL && blendmesh->key->type==KEY_RELATIVE; bool bHasDvert = blendmesh->dvert != NULL; bool bHasArmature = + BL_ModifierDeformer::HasArmatureDeformer(blendobj) && parentobj && // current parent is armature parentobj->GetGameObjectType() == SCA_IObject::OBJ_ARMATURE && oldblendobj && // needed for mesh deform blendobj->parent && // original object had armature (not sure this test is needed) - blendobj->parent->type == OB_ARMATURE && - blendobj->partype==PARSKEL && + blendobj->parent->type == OB_ARMATURE && blendmesh->dvert!=NULL; // mesh has vertex group bool bHasSoftBody = (!parentobj && (blendobj->gameflag & OB_SOFT_BODY)); |