History

Merge remote-tracking branch 'upstream/master' into android

Brad Davis committed 8 years ago

Commit 6a06bf42 parents b422321 d4571bd188 files · +1191 −774Browse files

Showing the changes to libraries/render-utils/src/RenderDeferredTask.cpp (1 of 188 files). Show all

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+1−1
@@ -322,7 +322,7 @@ void DrawDeferred::run(const RenderContextPointer& renderContext, const Inputs& · 321 unmodified lines
322 // Setup haze iff curretn zone has haze322 // Setup haze iff curretn zone has haze
323 auto hazeStage = args->_scene->getStage<HazeStage>();323 auto hazeStage = args->_scene->getStage<HazeStage>();
324 if (hazeStage && hazeStage->_currentFrame._hazes.size() > 0) {324 if (hazeStage && hazeStage->_currentFrame._hazes.size() > 0) {
325 model::HazePointer hazePointer = hazeStage->getHaze(hazeStage->_currentFrame._hazes.front());325 graphics::HazePointer hazePointer = hazeStage->getHaze(hazeStage->_currentFrame._hazes.front());
326 batch.setUniformBuffer(render::ShapePipeline::Slot::HAZE_MODEL, hazePointer->getHazeParametersBuffer());326 batch.setUniformBuffer(render::ShapePipeline::Slot::HAZE_MODEL, hazePointer->getHazeParametersBuffer());
327 }327 }
328 328