From 2c1b96025153c84e04f74bf2350d0cb963491b38 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Mon, 16 Nov 2015 12:08:53 +0100
Subject: [PATCH] (#266) Update grid box model in optimizeClippingPlanes

---
 ApplicationCode/ProjectDataModel/RimView.cpp | 2 +-
 ApplicationCode/UserInterface/RiuViewer.cpp  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ApplicationCode/ProjectDataModel/RimView.cpp b/ApplicationCode/ProjectDataModel/RimView.cpp
index 290023d386..d9f503573b 100644
--- a/ApplicationCode/ProjectDataModel/RimView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimView.cpp
@@ -271,8 +271,8 @@ void RimView::createDisplayModelAndRedraw()
         this->clampCurrentTimestep();
 
         createDisplayModel();
-        updateDisplayModelVisibility();
         createOverlayDisplayModel();
+        updateDisplayModelVisibility();
 
         if (cameraPosition().isIdentity())
         {
diff --git a/ApplicationCode/UserInterface/RiuViewer.cpp b/ApplicationCode/UserInterface/RiuViewer.cpp
index 25554260fe..ff3f7fc1cf 100644
--- a/ApplicationCode/UserInterface/RiuViewer.cpp
+++ b/ApplicationCode/UserInterface/RiuViewer.cpp
@@ -502,8 +502,6 @@ void RiuViewer::navigationPolicyUpdate()
         {
             viewLinker->updateCamera(m_rimView);
         }
-
-        m_gridBoxGenerator->updateFromCamera(mainCamera());
     }
 }
 
@@ -587,7 +585,8 @@ void RiuViewer::optimizeClippingPlanes()
 {
     caf::Viewer::optimizeClippingPlanes();
 
-    copyCameraView(m_mainCamera.p(), m_overlayRendering->camera());
+    m_gridBoxGenerator->updateFromCamera(mainCamera());
+    copyCameraView(mainCamera(), m_overlayRendering->camera());
 }
 
 //--------------------------------------------------------------------------------------------------