Throw the reset switch.

- fix up CanvasMgr so canvas works after new reset.

diff --git a/src/Canvas/gui_mgr.cxx b/src/Canvas/gui_mgr.cxx
index 453893886ba6ca100590fb8b7135c330242ab758..82b07615cd057d88dba1f3a0c80c9af109b0a25a 100644 (file)
--- a/src/Canvas/gui_mgr.cxx
+++ b/src/Canvas/gui_mgr.cxx
@@ -194,14 +194,6 @@ DesktopGroup::DesktopGroup():
   stateSet->setMode(GL_DEPTH_TEST, osg::StateAttribute::OFF);
 
   _width = _height = -1;
-
-  // Do not change values on reinit
-  _width.node()->setAttribute(SGPropertyNode::PRESERVE, true);
-  _height.node()->setAttribute(SGPropertyNode::PRESERVE, true);
-
-  // Do not restore windows on reinit (all windows will need to be recreated,
-  // but hey it's a reset ;-))
-  _node->setAttribute(SGPropertyNode::PRESERVE, true);
 }
 
 //------------------------------------------------------------------------------

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 5e0e71368e1cd54ace35dcae40b937c8764b3e1b..9653a11aeceb945362460ae6e8003ac163f234ce 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -142,7 +142,7 @@
 #include <GUI/CocoaHelpers.h> // for Mac impl of platformDefaultDataPath()
 #endif
 
-//#define NEW_RESET 1
+#define NEW_RESET 1
 
 using std::string;
 using std::endl;