From 61483e273990fefbd6b4c8af95c69b851816c472 Mon Sep 17 00:00:00 2001 From: Joseph Davies Date: Thu, 12 Jul 2012 16:38:45 -0700 Subject: [PATCH] Fix crash when loading converted Age. --- Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp b/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp index da06038d..468c5a8d 100644 --- a/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp @@ -370,7 +370,7 @@ NxScene* plSimulationMgr::GetScene(plKey world) scene->setGroupCollisionFlag(plSimDefs::kGroupAvatar, plSimDefs::kGroupAvatarBlocker, true); scene->setGroupCollisionFlag(plSimDefs::kGroupDynamic, plSimDefs::kGroupDynamicBlocker, true); scene->setGroupCollisionFlag(plSimDefs::kGroupAvatar, plSimDefs::kGroupStatic, true); - scene->setGroupCollisionFlag( plSimDefs::kGroupStatic, plSimDefs::kGroupAvatar, true); + scene->setGroupCollisionFlag(plSimDefs::kGroupStatic, plSimDefs::kGroupAvatar, true); scene->setGroupCollisionFlag(plSimDefs::kGroupAvatar, plSimDefs::kGroupDynamic, true); // Kinematically controlled avatars interact with detectors and dynamics @@ -650,7 +650,10 @@ int plSimulationMgr::GetMaterialIdx(NxScene* scene, float friction, float restit desc.dynamicFriction = friction; desc.staticFriction = friction; NxMaterial* mat = scene->createMaterial(desc); - return mat->getMaterialIndex(); + if (mat) + return mat->getMaterialIndex(); + else + return NULL; } /////////////////////////////////////////////////////////////////