History

Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr

Sam Cake committed 10 years ago

Commit dc4b6902 parents d2081dc fae1bd99 files · +146 −38Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+1−1
@@ -137,7 +137,7 @@ void RenderDeferredTask::run(const SceneContextPointer& sceneContext, const Rend · 136 unmodified lines
137 }137 }
138 138
139 // Make sure we turn the deferred buffer debug on/off139 // Make sure we turn the deferred buffer debug on/off
140 setDrawDebugDeferredBuffer(renderContext->_drawDebugDeferredBuffer);140 setDrawDebugDeferredBuffer(renderContext->_deferredDebugMode);
141 141
142 // Make sure we turn the displayItemStatus on/off142 // Make sure we turn the displayItemStatus on/off
143 setDrawItemStatus(renderContext->_drawItemStatus);143 setDrawItemStatus(renderContext->_drawItemStatus);