From 5cbb5000d2ddcc64a9b028dbffb26cfac8b1fdea Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Thu, 28 Jan 2016 11:42:54 -0800 Subject: [PATCH] Render the correct maxDrawnItems --- libraries/render/src/render/DrawTask.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/render/src/render/DrawTask.cpp b/libraries/render/src/render/DrawTask.cpp index 9bf9a9acd3..455a420355 100755 --- a/libraries/render/src/render/DrawTask.cpp +++ b/libraries/render/src/render/DrawTask.cpp @@ -155,7 +155,10 @@ void render::renderShapes(const SceneContextPointer& sceneContext, const RenderC auto& scene = sceneContext->_scene; RenderArgs* args = renderContext->args; - auto numItemsToDraw = glm::max((int)inItems.size(), maxDrawnItems); + int numItemsToDraw = (int)inItems.size(); + if (maxDrawnItems != -1) { + numItemsToDraw = glm::min(numItemsToDraw, maxDrawnItems); + } for (auto i = 0; i < numItemsToDraw; ++i) { auto& item = scene->getItem(inItems[i].id); renderShape(args, shapeContext, item); @@ -246,4 +249,4 @@ void DepthSortShapes::run(const SceneContextPointer& sceneContext, const RenderC depthSortItems(sceneContext, renderContext, _frontToBack, inItems, outItems->second); } -} \ No newline at end of file +}