From c9e1d8f5f4a2100b081edb127cc45c274b249ac6 Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Mon, 11 Jan 2016 19:10:29 -0800 Subject: [PATCH] Set up pipelinelib correctly (use filters insig bits) --- libraries/render/src/render/ShapePipeline.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libraries/render/src/render/ShapePipeline.cpp b/libraries/render/src/render/ShapePipeline.cpp index 5b89b6c6b7..99424cbf4b 100644 --- a/libraries/render/src/render/ShapePipeline.cpp +++ b/libraries/render/src/render/ShapePipeline.cpp @@ -25,12 +25,11 @@ ShapeKey::Filter::Builder::Builder() { void ShapePlumber::addPipelineHelper(const Filter& filter, ShapeKey key, int bit, const PipelinePointer& pipeline) { // Iterate over all keys if (bit < (int)ShapeKey::FlagBit::NUM_FLAGS) { - ++bit; - addPipelineHelper(filter, key, bit, pipeline); - if (filter._mask[bit]) { - // Toggle bits set as significant in filter._mask + addPipelineHelper(filter, key, bit + 1, pipeline); + if (!filter._mask[bit]) { + // Toggle bits set as insignificant in filter._mask key._flags.flip(bit); - addPipelineHelper(filter, key, bit, pipeline); + addPipelineHelper(filter, key, bit + 1, pipeline); } } else { // Add the brand new pipeline and cache its location in the lib