Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some work on fcollada import

Browse Source
This commit is contained in:
ejcoumans
2006-05-27 01:24:08 +00:00
parent 718faabe59
commit 7392431860
7 changed files with 22 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Extras/FCollada/FCDocument/FCDPhysicsShape.cpp
View File

@@ -167,15 +167,18 @@ FUStatus FCDPhysicsShape::LoadFromXML(xmlNode* physicsShapeNode)
else
{
FCDTransform* transform = FCDTFactory::CreateTransform(GetDocument(), NULL, child);
if (transform != NULL && (transform->GetType() != FCDTransform::TRANSLATION
|| transform->GetType() != FCDTransform::ROTATION || transform->GetType() != FCDTransform::SCALE))
if (transform)
{
SAFE_DELETE(transform);
}
else
{
transforms.push_back(transform);
status.AppendStatus(transform->LoadFromXML(child));
if (transform != NULL && (transform->GetType() != FCDTransform::TRANSLATION
|| transform->GetType() != FCDTransform::ROTATION || transform->GetType() != FCDTransform::SCALE))
{
SAFE_DELETE(transform);
}
else
{
transforms.push_back(transform);
status.AppendStatus(transform->LoadFromXML(child));
}
}
}
}