archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix a game engine crash with mesh objects parented to an armature

Browse Source 
without vertex groups.
This commit is contained in:
Brecht Van Lommel
2008-09-14 17:59:22 +00:00
parent 0ad48b7332
commit 59b202fc32
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/gameengine/Converter/BL_BlenderDataConversion.cpp
View File

@@ -783,9 +783,9 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
MT_Point2 uv20(0.0,0.0),uv21(0.0,0.0),uv22(0.0,0.0),uv23(0.0,0.0); MT_Point2 uv20(0.0,0.0),uv21(0.0,0.0),uv22(0.0,0.0),uv23(0.0,0.0);
unsigned int rgb0,rgb1,rgb2,rgb3 = 0; unsigned int rgb0,rgb1,rgb2,rgb3 = 0;
MT_Vector3 no0, no1, no2, no3;
MT_Point3 pt0, pt1, pt2, pt3; MT_Point3 pt0, pt1, pt2, pt3;
MT_Vector4 tan0, tan1, tan2, tan3; MT_Vector3 no0(0,0,0), no1(0,0,0), no2(0,0,0), no3(0,0,0);
MT_Vector4 tan0(0,0,0,0), tan1(0,0,0,0), tan2(0,0,0,0), tan3(0,0,0,0);
/* get coordinates, normals and tangents */ /* get coordinates, normals and tangents */
pt0 = MT_Point3(mvert[mface->v1].co); pt0 = MT_Point3(mvert[mface->v1].co);
@@ -807,8 +807,6 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, RAS_IRenderTools*
NormalShortToFloat(n3, mvert[mface->v4].no); NormalShortToFloat(n3, mvert[mface->v4].no);
no3 = n3; no3 = n3;
} }
else
no3 = MT_Vector3(0.0, 0.0, 0.0);
} }
else { else {
float fno[3]; float fno[3];
@@ -2190,12 +2188,12 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
Mesh *me = (Mesh*)blenderobj->data; Mesh *me = (Mesh*)blenderobj->data;
if (me->dvert){ if (me->dvert){
KX_GameObject *obj = converter->FindGameObject(blenderobj); BL_DeformableGameObject *obj = (BL_DeformableGameObject*)converter->FindGameObject(blenderobj);
if (obj && blenderobj->parent && blenderobj->parent->type==OB_ARMATURE && blenderobj->partype==PARSKEL){ if (obj && blenderobj->parent && blenderobj->parent->type==OB_ARMATURE && blenderobj->partype==PARSKEL){
KX_GameObject *par = converter->FindGameObject(blenderobj->parent); KX_GameObject *par = converter->FindGameObject(blenderobj->parent);
if (par) if (par && obj->m_pDeformer)
((BL_SkinDeformer*)(((BL_DeformableGameObject*)obj)->m_pDeformer))->SetArmature((BL_ArmatureObject*) par); ((BL_SkinDeformer*)obj->m_pDeformer)->SetArmature((BL_ArmatureObject*) par);
} }
} }
} }