Merge pull request #4870 from sethalves/quiet-model-log-spam

don't allow buildModelMesh to spam logs when it encounters flawed models
This commit is contained in:
Clément Brisset 2015-05-14 19:36:57 +02:00
commit a3dc7def7b

View file

@ -29,7 +29,7 @@
#include <OctalCode.h> #include <OctalCode.h>
#include <Shape.h> #include <Shape.h>
#include <gpu/Format.h> #include <gpu/Format.h>
#include <LogHandler.h>
#include "FBXReader.h" #include "FBXReader.h"
#include "ModelFormatLogging.h" #include "ModelFormatLogging.h"
@ -1281,9 +1281,11 @@ FBXLight extractLight(const FBXNode& object) {
#if USE_MODEL_MESH #if USE_MODEL_MESH
void buildModelMesh(ExtractedMesh& extracted) { void buildModelMesh(ExtractedMesh& extracted) {
static QString repeatedMessage = LogHandler::getInstance().addRepeatedMessageRegex("buildModelMesh failed -- .*");
if (extracted.mesh.vertices.size() == 0) { if (extracted.mesh.vertices.size() == 0) {
extracted.mesh._mesh = model::Mesh(); extracted.mesh._mesh = model::Mesh();
qDebug() << "buildModelMesh failed -- no vertices"; qCDebug(modelformat) << "buildModelMesh failed -- no vertices";
return; return;
} }
FBXMesh& fbxMesh = extracted.mesh; FBXMesh& fbxMesh = extracted.mesh;
@ -1370,7 +1372,7 @@ void buildModelMesh(ExtractedMesh& extracted) {
if (! totalIndices) { if (! totalIndices) {
extracted.mesh._mesh = model::Mesh(); extracted.mesh._mesh = model::Mesh();
qDebug() << "buildModelMesh failed -- no indices"; qCDebug(modelformat) << "buildModelMesh failed -- no indices";
return; return;
} }
@ -1410,7 +1412,7 @@ void buildModelMesh(ExtractedMesh& extracted) {
mesh.setPartBuffer(pbv); mesh.setPartBuffer(pbv);
} else { } else {
extracted.mesh._mesh = model::Mesh(); extracted.mesh._mesh = model::Mesh();
qDebug() << "buildModelMesh failed -- no parts"; qCDebug(modelformat) << "buildModelMesh failed -- no parts";
return; return;
} }