Guard batchSetter invocation for ShapePipelines

This commit is contained in:
Zach Pomerantz 2016-02-08 17:05:55 -08:00
parent 281ba3c3ea
commit 63d87550b1
2 changed files with 7 additions and 1 deletions

View file

@ -17,6 +17,12 @@
using namespace render;
void ShapePipeline::prepare(gpu::Batch& batch) {
if (batchSetter) {
batchSetter(*this, batch);
}
}
ShapeKey::Filter::Builder::Builder() {
_mask.set(OWN_PIPELINE);
_mask.set(INVALID);

View file

@ -225,7 +225,7 @@ public:
// Normally, a pipeline is accessed thorugh pickPipeline. If it needs to be set manually,
// after calling setPipeline this method should be called to prepare the pipeline with default buffers.
void prepare(gpu::Batch& batch) { batchSetter(*this, batch); }
void prepare(gpu::Batch& batch);
gpu::PipelinePointer pipeline;
std::shared_ptr<Locations> locations;