Merge branch 'master' of https://github.com/highfidelity/hifi into yellow

Sam Gateau committed 11 years ago

Commit fe633cd2 parents 4d48b98 21562c026 files · +318 −1095Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+0−1

@@ -146,7 +146,6 @@ void DrawOpaqueDeferred::run(const SceneContextPointer& sceneContext, const Rend · 145 unmodified lines
146	void DrawTransparentDeferred::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext, const ItemIDsBounds& inItems) {	146	void DrawTransparentDeferred::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext, const ItemIDsBounds& inItems) {
147	assert(renderContext->args);	147	assert(renderContext->args);
148	assert(renderContext->args->_viewFrustum);	148	assert(renderContext->args->_viewFrustum);
149	auto& renderDetails = renderContext->args->_details;
150		149
151	RenderArgs* args = renderContext->args;	150	RenderArgs* args = renderContext->args;
152	gpu::Batch batch;	151	gpu::Batch batch;