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

Merge pull request #1084 from erwincoumans/master

Browse Source 
fix some potentially uninitialized variable
This commit is contained in:
erwincoumans
2017-04-26 05:29:38 +00:00
committed by GitHub
parent 2b4f6d7997 e4ace90980
commit 09280d6f7b
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/Importers/ImportMJCFDemo/BulletMJCFImporter.cpp
View File

@@ -1741,6 +1741,11 @@ class btCompoundShape* BulletMJCFImporter::convertLinkCollisionShapes(int linkIn
} }
break; break;
} }
case URDF_GEOM_UNKNOWN:
{
break;
}
} // switch geom } // switch geom
if (childShape) if (childShape)

14
examples/Importers/ImportURDFDemo/UrdfParser.h
View File

@@ -50,9 +50,9 @@ enum UrdfGeomTypes
URDF_GEOM_BOX, URDF_GEOM_BOX,
URDF_GEOM_CYLINDER, URDF_GEOM_CYLINDER,
URDF_GEOM_MESH, URDF_GEOM_MESH,
URDF_GEOM_PLANE, URDF_GEOM_PLANE,
URDF_GEOM_CAPSULE//non-standard URDF? URDF_GEOM_CAPSULE, //non-standard URDF?
URDF_GEOM_UNKNOWN,
}; };
@@ -83,6 +83,14 @@ struct UrdfGeometry
UrdfMaterial m_localMaterial; UrdfMaterial m_localMaterial;
bool m_hasLocalMaterial; bool m_hasLocalMaterial;
UrdfGeometry()
:m_type(URDF_GEOM_UNKNOWN),
m_hasFromTo(false),
m_hasLocalMaterial(false)
{
}
}; };
bool findExistingMeshFile(const std::string& urdf_path, std::string fn, bool findExistingMeshFile(const std::string& urdf_path, std::string fn,