History

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

Brad Davis committed 8 years ago

Commit bdfa1272 parents cbb2d9d 2e4fc5e63 files · +921 −822Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+4−2
@@ -319,11 +319,13 @@ void DrawDeferred::run(const RenderContextPointer& renderContext, const Inputs& · 318 unmodified lines
319 // Setup lighting model for all items;319 // Setup lighting model for all items;
320 batch.setUniformBuffer(render::ShapePipeline::Slot::LIGHTING_MODEL, lightingModel->getParametersBuffer());320 batch.setUniformBuffer(render::ShapePipeline::Slot::LIGHTING_MODEL, lightingModel->getParametersBuffer());
321 321
322 // Setup haze iff curretn zone has haze322 // Setup haze iff current 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 graphics::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 if (hazePointer) {
327 batch.setUniformBuffer(render::ShapePipeline::Slot::HAZE_MODEL, hazePointer->getHazeParametersBuffer());
328 }
327 }329 }
328 330
329 // From the lighting model define a global shapKey ORED with individiual keys331 // From the lighting model define a global shapKey ORED with individiual keys