From e574be785573c84a60ff486e969403cac522f031 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Thu, 16 Nov 2017 10:00:32 +0100
Subject: [PATCH] Fixed potential mismatch between push/popViewFrustum in
 shadow task

---
 libraries/render-utils/src/RenderShadowTask.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index 7a6e3dc74f..2dd6c5d44f 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -263,7 +263,10 @@ void RenderShadowSetup::run(const render::RenderContextPointer& renderContext, O
 void RenderShadowTeardown::run(const render::RenderContextPointer& renderContext, const Input& input) {
     RenderArgs* args = renderContext->args;
 
-    // Reset the render args
-    args->popViewFrustum();
+    if (args->_renderMode == RenderArgs::SHADOW_RENDER_MODE) {
+        // Reset the render args
+        args->popViewFrustum();
+    }
+    assert(args->hasViewFrustum());
     args->_renderMode = input;
 };