Merge branch 'squelch-cannot-render' of github.com:sethalves/hifi into controller-dispatcher-1

This commit is contained in:
Seth Alves 2017-09-08 15:32:54 -07:00
commit eddf1efb6f

View file

@ -9,6 +9,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include <LogHandler.h>
#include "DrawTask.h"
#include "Logging.h"
@ -54,6 +56,8 @@ void renderShape(RenderArgs* args, const ShapePlumberPointer& shapeContext, cons
item.render(args);
} else {
qCDebug(renderlogging) << "Item could not be rendered with invalid key" << key;
static QString repeatedCouldNotBeRendered = LogHandler::getInstance().addRepeatedMessageRegex(
"Item could not be rendered with invalid key.*");
}
args->_itemShapeKey = 0;
}
@ -104,6 +108,8 @@ void render::renderStateSortShapes(const RenderContextPointer& renderContext,
} else if (key.hasOwnPipeline()) {
ownPipelineBucket.push_back( std::make_tuple(item, key) );
} else {
static QString repeatedCouldNotBeRendered = LogHandler::getInstance().addRepeatedMessageRegex(
"Item could not be rendered with invalid key.*");
qCDebug(renderlogging) << "Item could not be rendered with invalid key" << key;
}
}