FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed redundent assert and associated variables to fix warnings.

Browse Source
This commit is contained in:
Robert Osfield
2011-06-24 16:15:47 +00:00
parent d6a3ac647b
commit a9658dbd4d
2 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgPlugins/3ds/WriterNodeVisitor.cpp
View File

@@ -483,14 +483,11 @@ void WriterNodeVisitor::writeMaterials()
// Ugly thing: it seems lib3ds_file_insert_material() doesn't support insertion in a random order (else materials are not assigned the right way)
for (unsigned int iMat=0; iMat<nbMat; ++iMat)
{
bool found = false;
for(MaterialMap::iterator itr = _materialMap.begin(); itr != _materialMap.end(); ++itr)
{
const Material & mat = itr->second;
if (mat.index != static_cast<int>(iMat)) continue; // Ugly thing (2)
found = true;
assert(mat.index>=0 && mat.index < static_cast<int>(_materialMap.size()));
Lib3dsMaterial * mat3ds = lib3ds_material_new(osgDB::getSimpleFileName(mat.name).c_str());
copyOsgColorToLib3dsColor(mat3ds->ambient, mat.ambient);
copyOsgColorToLib3dsColor(mat3ds->diffuse, mat.diffuse);
@@ -545,7 +542,6 @@ void WriterNodeVisitor::writeMaterials()
lib3ds_file_insert_material(_file3ds, mat3ds, itr->second.index);
break; // Ugly thing (3)
}
assert(found); // Ugly thing (4) - Implementation error if !found
}
}