Merge pull request #13595 from NissimHadar/bug16595

Fix for "PAL orbs are no longer visible through tablet/toolbar and objects in world"
This commit is contained in:
John Conklin II 2018-07-12 16:01:01 -07:00 committed by GitHub
commit 6e3bede7d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -51,7 +51,6 @@ void DrawOverlay3D::run(const RenderContextPointer& renderContext, const Inputs&
config->setNumDrawn((int)inItems.size()); config->setNumDrawn((int)inItems.size());
emit config->numDrawnChanged(); emit config->numDrawnChanged();
if (!inItems.empty()) {
RenderArgs* args = renderContext->args; RenderArgs* args = renderContext->args;
// Clear the framebuffer without stereo // Clear the framebuffer without stereo
@ -64,6 +63,7 @@ void DrawOverlay3D::run(const RenderContextPointer& renderContext, const Inputs&
}); });
} }
if (!inItems.empty()) {
// Render the items // Render the items
gpu::doInBatch("DrawOverlay3D::main", args->_context, [&](gpu::Batch& batch) { gpu::doInBatch("DrawOverlay3D::main", args->_context, [&](gpu::Batch& batch) {
args->_batch = &batch; args->_batch = &batch;