return &desc;
}
-static void releaseMaterial( aiMaterial **mat ) {
+static void releaseMaterial( aiMaterial *mat ) {
delete mat;
- *mat = nullptr;
+ mat = nullptr;
}
-static void releaseMesh( aiMesh **mesh ) {
+static void releaseMesh( aiMesh *mesh ) {
delete mesh;
- *mesh = nullptr;
+ mesh = nullptr;
}
// ------------------------------------------------------------------------------------------------
// end of previous buffer. A material and a mesh should be there
if ( !curMat || !curMesh) {
DefaultLogger::get()->error("IRRMESH: A buffer must contain a mesh and a material");
- releaseMaterial( &curMat );
- releaseMesh( &curMesh );
+ releaseMaterial( curMat );
+ releaseMesh( curMesh );
} else {
materials.push_back(curMat);
meshes.push_back(curMesh);
if (!ASSIMP_stricmp(reader->getNodeName(),"material")) {
if (curMat) {
DefaultLogger::get()->warn("IRRMESH: Only one material description per buffer, please");
- releaseMaterial( &curMat );
+ releaseMaterial( curMat );
}
curMat = ParseMaterial(curMatFlags);
}
// This is possible ... remove the mesh from the list and skip further reading
DefaultLogger::get()->warn("IRRMESH: Found mesh with zero vertices");
- releaseMaterial( &curMat );
- releaseMesh( &curMesh );
+ releaseMaterial( curMat );
+ releaseMesh( curMesh );
textMeaning = 0;
continue;
}
vertexFormat = 2;
}
else if (ASSIMP_stricmp("standard", t)) {
- releaseMaterial( &curMat );
+ releaseMaterial( curMat );
DefaultLogger::get()->warn("IRRMESH: Unknown vertex format");
}
else vertexFormat = 0;
}
else if (!ASSIMP_stricmp(reader->getNodeName(),"indices")) {
if (curVertices.empty() && curMat) {
- releaseMaterial( &curMat );
+ releaseMaterial( curMat );
throw DeadlyImportError("IRRMESH: indices must come after vertices");
}
DefaultLogger::get()->warn("IRRMESH: Found mesh with zero indices");
// mesh - away
- releaseMesh( &curMesh );
+ releaseMesh( curMesh );
// material - away
- releaseMaterial( &curMat );
+ releaseMaterial( curMat );
textMeaning = 0;
continue;
if (curMat || curMesh) {
if ( !curMat || !curMesh) {
DefaultLogger::get()->error("IRRMESH: A buffer must contain a mesh and a material");
- releaseMaterial( &curMat );
- releaseMesh( &curMesh );
+ releaseMaterial( curMat );
+ releaseMesh( curMesh );
}
else {
materials.push_back(curMat);