mirror of
https://github.com/bulletphysics/bullet3
synced 2024-12-13 21:30:09 +00:00
Merge pull request #1084 from erwincoumans/master
fix some potentially uninitialized variable
This commit is contained in:
commit
09280d6f7b
@ -1741,6 +1741,11 @@ class btCompoundShape* BulletMJCFImporter::convertLinkCollisionShapes(int linkIn
|
||||
}
|
||||
break;
|
||||
}
|
||||
case URDF_GEOM_UNKNOWN:
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
} // switch geom
|
||||
|
||||
if (childShape)
|
||||
|
@ -50,9 +50,9 @@ enum UrdfGeomTypes
|
||||
URDF_GEOM_BOX,
|
||||
URDF_GEOM_CYLINDER,
|
||||
URDF_GEOM_MESH,
|
||||
URDF_GEOM_PLANE,
|
||||
URDF_GEOM_CAPSULE//non-standard URDF?
|
||||
|
||||
URDF_GEOM_PLANE,
|
||||
URDF_GEOM_CAPSULE, //non-standard URDF?
|
||||
URDF_GEOM_UNKNOWN,
|
||||
};
|
||||
|
||||
|
||||
@ -83,6 +83,14 @@ struct UrdfGeometry
|
||||
|
||||
UrdfMaterial m_localMaterial;
|
||||
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,
|
||||
|
Loading…
Reference in New Issue
Block a user