Browse Source

Merge pull request #347 from Deledrius/fanagecrashworkaround

Workaround crash when linking to converted fan Ages
Adam Johnson 11 years ago
parent
commit
961a168131
  1. 3
      Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp

3
Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp

@ -650,7 +650,10 @@ int plSimulationMgr::GetMaterialIdx(NxScene* scene, float friction, float restit
desc.dynamicFriction = friction;
desc.staticFriction = friction;
NxMaterial* mat = scene->createMaterial(desc);
if (mat)
return mat->getMaterialIndex();
else
return NULL;
}
/////////////////////////////////////////////////////////////////

Loading…
Cancel
Save