diff --git a/examples/Importers/ImportURDFDemo/UrdfParser.cpp b/examples/Importers/ImportURDFDemo/UrdfParser.cpp index 9e9594e81..38b10ad17 100644 --- a/examples/Importers/ImportURDFDemo/UrdfParser.cpp +++ b/examples/Importers/ImportURDFDemo/UrdfParser.cpp @@ -569,6 +569,15 @@ bool UrdfParser::parseVisual(UrdfModel& model, UrdfVisual& visual, TiXmlElement* matPtr->m_name = "mat"; if (name_char) matPtr->m_name = name_char; + + UrdfMaterial** oldMatPtrPtr = model.m_materials[matPtr->m_name.c_str()]; + if (oldMatPtrPtr) + { + UrdfMaterial* oldMatPtr = *oldMatPtrPtr; + model.m_materials.remove(matPtr->m_name.c_str()); + if (oldMatPtr) + delete oldMatPtr; + } model.m_materials.insert(matPtr->m_name.c_str(),matPtr); { TiXmlElement *diffuse = mat->FirstChildElement("diffuse"); diff --git a/examples/SharedMemory/SharedMemoryInProcessPhysicsC_API.cpp b/examples/SharedMemory/SharedMemoryInProcessPhysicsC_API.cpp index 5a545795b..142d42a30 100644 --- a/examples/SharedMemory/SharedMemoryInProcessPhysicsC_API.cpp +++ b/examples/SharedMemory/SharedMemoryInProcessPhysicsC_API.cpp @@ -53,13 +53,13 @@ public: } } { - //unsigned long int ms = m_clock.getTimeMilliseconds(); - //if (ms>2) + unsigned long int ms = m_clock.getTimeMilliseconds(); + if (ms>2) { - // B3_PROFILE("m_clock.reset()"); + B3_PROFILE("m_clock.reset()"); - // m_clock.reset(); - btUpdateInProcessExampleBrowserMainThread(m_data); + btUpdateInProcessExampleBrowserMainThread(m_data); + m_clock.reset(); } } { diff --git a/src/LinearMath/btConvexHullComputer.cpp b/src/LinearMath/btConvexHullComputer.cpp index c49675daa..2ea22cbe3 100644 --- a/src/LinearMath/btConvexHullComputer.cpp +++ b/src/LinearMath/btConvexHullComputer.cpp @@ -1277,21 +1277,21 @@ void btConvexHullInternal::computeInternal(int start, int end, IntermediateHull& return; } - } - { - Vertex* v = originalVertices[start]; - v->edges = NULL; - v->next = v; - v->prev = v; + { + Vertex* v = originalVertices[start]; + v->edges = NULL; + v->next = v; + v->prev = v; - result.minXy = v; - result.maxXy = v; - result.minYx = v; - result.maxYx = v; + result.minXy = v; + result.maxXy = v; + result.minYx = v; + result.maxYx = v; } return; } + case 1: { Vertex* v = originalVertices[start];