From 63d87550b1a7f003822345834632c5486a3613bc Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Mon, 8 Feb 2016 17:05:55 -0800
Subject: [PATCH] Guard batchSetter invocation for ShapePipelines

---
 libraries/render/src/render/ShapePipeline.cpp | 6 ++++++
 libraries/render/src/render/ShapePipeline.h   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/libraries/render/src/render/ShapePipeline.cpp b/libraries/render/src/render/ShapePipeline.cpp
index 588b02a316..b77c9c3451 100644
--- a/libraries/render/src/render/ShapePipeline.cpp
+++ b/libraries/render/src/render/ShapePipeline.cpp
@@ -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);
diff --git a/libraries/render/src/render/ShapePipeline.h b/libraries/render/src/render/ShapePipeline.h
index ef2020f062..4fd1dc22c5 100644
--- a/libraries/render/src/render/ShapePipeline.h
+++ b/libraries/render/src/render/ShapePipeline.h
@@ -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;