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

Fix formatting

Browse Source
This commit is contained in:
Oleg Klimov
2017-03-10 19:46:46 +03:00
parent 82495f3c84
commit 3a8199ec28
2 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples/Importers/ImportURDFDemo/UrdfParser.cpp
View File

@@ -439,7 +439,8 @@ bool UrdfParser::parseGeometry(UrdfGeometry& geom, TiXmlElement* g, ErrorLogger*
}
else
{
if (!shape->Attribute("filename")) {
if (!shape->Attribute("filename"))
{
logger->reportError("Mesh must contain a filename attribute");
return false;
}
@@ -447,7 +448,11 @@ bool UrdfParser::parseGeometry(UrdfGeometry& geom, TiXmlElement* g, ErrorLogger*
bool success = findExistingMeshFile(
m_urdf2Model.m_sourceFile, shape->Attribute("filename"), sourceFileLocation(shape),
&geom.m_meshFileName, &geom.m_meshFileType);
if (!success) return false; // warning printed
if (!success)
{
// warning printed
return false;
}
geom.m_meshScale.setValue(1,1,1);
if (shape->Attribute("scale"))