TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash that happens when using OdeTriMeshData incorrectly

Browse Source
This commit is contained in:
rdb 2016-09-11 12:23:28 +02:00
parent 558f84a95f
commit a0b2a98178
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
panda/src/ode/odeTriMeshData.cxx
View File

@ -55,25 +55,30 @@ print_data(const string &marker) {
void OdeTriMeshData::
remove_data(OdeTriMeshData *data) {
odetrimeshdata_cat.debug() << get_class_type() << "::remove_data(" << data->get_id() << ")" << "\n";
nassertv(_tri_mesh_data_map != (TriMeshDataMap *)NULL);
if (odetrimeshdata_cat.is_debug()) {
odetrimeshdata_cat.debug()
<< get_class_type() << "::remove_data(" << data->get_id() << ")" << "\n";
}
if (_tri_mesh_data_map == (TriMeshDataMap *)NULL) {
return;
}
TriMeshDataMap::iterator iter;
for (iter = _tri_mesh_data_map->begin();
iter != _tri_mesh_data_map->end();
++iter) {
if ( iter->second == data ) {
if (iter->second == data) {
break;
}
}
while (iter != _tri_mesh_data_map->end()) {
_tri_mesh_data_map->erase(iter);
for (iter = _tri_mesh_data_map->begin();
iter != _tri_mesh_data_map->end();
++iter) {
if ( iter->second == data ) {
if (iter->second == data) {
break;
}
}
@ -154,8 +159,13 @@ operator = (const OdeTriMeshData &other) {
void OdeTriMeshData::
process_model(const NodePath& model, bool &use_normals) {
// TODO: assert if _vertices is something other than 0.
ostream &out = odetrimeshdata_cat.debug();
out << "process_model(" << model << ")" << "\n";
if (odetrimeshdata_cat.is_debug()) {
odetrimeshdata_cat.debug()
<< "process_model(" << model << ")" << "\n";
}
if (model.is_empty()) {
return;
}
NodePathCollection geomNodePaths = model.find_all_matches("**/+GeomNode");
if (model.node()->get_type() == GeomNode::get_class_type()) {