Commit ddf25fe1 authored by Martin Schultz's avatar Martin Schultz

added changes from pre submodule mergerequest

doesnt emit an OM error message for every face that could not be added
parent 7ceefca0
......@@ -656,6 +656,10 @@ void FileOBJPlugin::readOBJFile(QByteArray& _bufferedFile, QString _filename, OB
// Now add all meshes for every group (if exists)
createAllGroupObjects(_importer);
const bool omerr_enabled = omerr().is_enabled();
if (omerr_enabled)
omerr().disable();
while( !input.atEnd() )
{
line=input.readLine();
......@@ -1250,6 +1254,9 @@ void FileOBJPlugin::readOBJFile(QByteArray& _bufferedFile, QString _filename, OB
}
if (omerr_enabled)
omerr().enable();
//checks, if an object with a specified type was added. if not, point cloud was read
bool isType = faceCount != 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment