Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 03:13:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ordering of batchSetter in pickPipeline

Browse source
This commit is contained in:
Zach Pomerantz 2016-02-02 19:28:44 -08:00
parent a790b09892
commit 127f9694f6
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/render/src/render/ShapePipeline.cpp
View file

@ -95,13 +95,13 @@ const ShapePipelinePointer ShapePlumber::pickPipeline(RenderArgs* args, const Ke
PipelinePointer shapePipeline(pipelineIterator->second); PipelinePointer shapePipeline(pipelineIterator->second);
auto& batch = args->_batch; auto& batch = args->_batch;
// Setup the one pipeline (to rule them all)
batch->setPipeline(shapePipeline->pipeline);
// Run the pipeline's BatchSetter on the passed in batch // Run the pipeline's BatchSetter on the passed in batch
if (shapePipeline->batchSetter) { if (shapePipeline->batchSetter) {
shapePipeline->batchSetter(*shapePipeline, *batch); shapePipeline->batchSetter(*shapePipeline, *batch);
} }
// Setup the one pipeline (to rule them all)
batch->setPipeline(shapePipeline->pipeline);
return shapePipeline; return shapePipeline;
} }