From e00b629133fa26c6454746b3c5d2622ba75e5d48 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 9 Jan 2015 16:11:17 -0800 Subject: [PATCH] Fix gl projection matrix stack overflow when rendering to HUD The projection matrix stack is considerably smaller than the modelview stack and was overflowing on Windows and Linux machines that were tested. --- interface/src/ui/ApplicationOverlay.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp index 1d710f29d4..106c74cdeb 100644 --- a/interface/src/ui/ApplicationOverlay.cpp +++ b/interface/src/ui/ApplicationOverlay.cpp @@ -197,19 +197,23 @@ void ApplicationOverlay::renderOverlay(bool renderToTexture) { const float FAR_CLIP = 10000; glLoadIdentity(); glOrtho(0, glCanvas->width(), glCanvas->height(), 0, NEAR_CLIP, FAR_CLIP); - + + glMatrixMode(GL_MODELVIEW); + renderAudioMeter(); - + renderStatsAndLogs(); - + // give external parties a change to hook in emit application->renderingOverlay(); - + overlays.renderHUD(); - + renderPointers(); - + renderDomainConnectionStatusBorder(); + + glMatrixMode(GL_PROJECTION); } glPopMatrix(); glMatrixMode(GL_MODELVIEW);