Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

some fixes in a recent contribution, added return values and check for valid pointer, to avoid crashes.

Browse Source
This commit is contained in:
Erwin Coumans
2006-12-12 13:24:45 +00:00
parent ed6da1709f
commit 87e67afd9b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1602,6 +1602,8 @@ KX_IPhysicsController* getPhId(CListValue* sumolist,STR_String busc){//not used
return gameobje->GetPhysicsController(); return gameobje->GetPhysicsController();
} }
return 0;
} }
KX_GameObject* getGameOb(STR_String busc,CListValue* sumolist){ KX_GameObject* getGameOb(STR_String busc,CListValue* sumolist){
@@ -1613,6 +1615,8 @@ KX_GameObject* getGameOb(STR_String busc,CListValue* sumolist){
return gameobje; return gameobje;
} }
return 0;
} }
// convert blender objects into ketsji gameobjects // convert blender objects into ketsji gameobjects
@@ -1945,6 +1949,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
if (dat->tar) if (dat->tar)
{ {
KX_GameObject *gotar=getGameOb(dat->tar->id.name,sumolist); KX_GameObject *gotar=getGameOb(dat->tar->id.name,sumolist);
if (gotar)
physctr2 = (PHY_IPhysicsController*) gotar->GetPhysicsController()->GetUserData(); physctr2 = (PHY_IPhysicsController*) gotar->GetPhysicsController()->GetUserData();
} }