Mercurial > hg > orthanc-stone

diff Framework/Scene2DViewport/ViewportController.h @ 900:f9ae731fdc25 am-dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Alain Mazy <alain@mazy.be>
date Tue, 16 Jul 2019 12:42:31 +0200
parents 0c5201499af8
children a911f5bb48da
line wrap: on
line diff
--- a/Framework/Scene2DViewport/ViewportController.h	Tue Jul 16 12:37:29 2019 +0200
+++ b/Framework/Scene2DViewport/ViewportController.h	Tue Jul 16 12:42:31 2019 +0200
@@ -181,7 +181,7 @@
 
     const Scene2D& GetScene() const
     {
-      return scene_;
+      return const_cast<IViewport&>(viewport_).GetScene();
     }
 
   private:
@@ -197,10 +197,8 @@
     
     // this is cached
     mutable double              canvasToSceneFactor_;
-
-
+    
     // Refactoring on 2019-07-10: Removing shared_ptr from scene
     IViewport&      viewport_;
-    const Scene2D&  scene_;  // As long as the viewport exists, its associated scene too   
   };
 }