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

fix potential memory leaks

Browse Source
This commit is contained in:
Erwin Coumans
2017-06-07 19:00:44 -07:00
parent 46f2f3db4e
commit c1e32e6428
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/Importers/ImportMeshUtility/b3ImportMeshUtility.cpp
View File

@@ -64,8 +64,10 @@ bool b3ImportMeshUtility::loadAndRegisterMeshFromFileInternal(const std::string&
meshData.m_textureHeight = height; meshData.m_textureHeight = height;
} else } else
{ {
b3Warning("Unsupported texture image format [%s]\n",relativeFileName);
meshData.m_textureWidth = 0; meshData.m_textureWidth = 0;
meshData.m_textureHeight = 0; meshData.m_textureHeight = 0;
break;
} }
} else } else

8
examples/Importers/ImportURDFDemo/BulletUrdfImporter.cpp
View File

@@ -1243,6 +1243,14 @@ btCollisionShape* BulletURDFImporter::getAllocatedCollisionShape(int index)
const UrdfCollision& col = link->m_collisionArray[v]; const UrdfCollision& col = link->m_collisionArray[v];
btCollisionShape* childShape = convertURDFToCollisionShape(&col ,pathPrefix); btCollisionShape* childShape = convertURDFToCollisionShape(&col ,pathPrefix);
m_data->m_allocatedCollisionShapes.push_back(childShape); m_data->m_allocatedCollisionShapes.push_back(childShape);
if (childShape->getShapeType()==COMPOUND_SHAPE_PROXYTYPE)
{
btCompoundShape* compound = (btCompoundShape*) childShape;
for (int i=0;i<compound->getNumChildShapes();i++)
{
m_data->m_allocatedCollisionShapes.push_back(compound->getChildShape(i));
}
}
if (childShape) if (childShape)
{ {

5
examples/SharedMemory/PhysicsServerExample.cpp
View File

@@ -723,6 +723,11 @@ public:
virtual ~MultiThreadedOpenGLGuiHelper() virtual ~MultiThreadedOpenGLGuiHelper()
{ {
//delete m_childGuiHelper; //delete m_childGuiHelper;
if (m_debugDraw)
{
delete m_debugDraw;
m_debugDraw = 0;
}
} }
void setCriticalSection(b3CriticalSection* cs) void setCriticalSection(b3CriticalSection* cs)