Fix env variables resetting on restart

toonz/sources/tnztools/perspectivetool.cpp

@@ -27,8 +27,6 @@
 TEnv::IntVar PerspectiveToolAdvancedControls("PerspectiveToolAdvancedControls",
                                              0);
 
-PerspectiveTool perspectiveTool;
-
 //----------------------------------------------------------------------------------------------------------
 
 void PerspectivePreset::saveData(TOStream &os) {
@@ -513,6 +511,7 @@ PerspectiveTool::PerspectiveTool()
     , m_isRightMoving(false)
     , m_selecting(false)
     , m_selectingRect(TRectD())
+    , m_firstTime(false)
     , m_undo(0) {
   bind(TTool::AllTargets);
 
@@ -537,7 +536,7 @@ PerspectiveTool::PerspectiveTool()
   m_color.addValue(L"Black", TPixel::Black);
   m_color.setId("Color");
 
-  m_advancedControls.setValue(PerspectiveToolAdvancedControls);
+  m_advancedControls.setValue(false);
 
   m_preset.setId("PerspectivePreset");
   m_preset.addValue(CUSTOM_WSTR);
@@ -610,6 +609,15 @@ void PerspectiveTool::setToolOptionsBox(
   m_toolOptionsBox.push_back(toolOptionsBox);
 }
 
+//-----------------------------------------------------------------------------
+
+void PerspectiveTool::onActivate() {
+  if (!m_firstTime) {
+    m_firstTime = true;
+    m_advancedControls.setValue(PerspectiveToolAdvancedControls);
+  }
+}
+
 //----------------------------------------------------------------------------------------------
 
 bool PerspectiveTool::onPropertyChanged(std::string propertyName) {
@@ -1918,6 +1926,7 @@ void PerspectiveTool::saveTool() {
 }
 
 void PerspectiveTool::loadTool() {
+  onActivate();
   m_presetsManager.loadPresets(
       ToonzFolder::getMyModuleDir());  // Load custom grid from last session
   PerspectivePreset preset = m_presetsManager.getCustomPreset();
@@ -2215,3 +2224,5 @@ TPointD LinePerspective::getReferencePoint(TPointD firstPoint) {
 
   return refPoint;
 }
+
+PerspectiveTool perspectiveTool;

toonz/sources/tnztools/perspectivetool.h

@@ -430,6 +430,7 @@ public:
   void leftButtonUp(const TPointD &pos, const TMouseEvent &) override;
   bool keyDown(QKeyEvent *event) override;
 
+  void onActivate() override;
   bool onPropertyChanged(std::string propertyName) override;
 
   int getCursorId() const override { return ToolCursor::StrokeSelectCursor; };
@@ -496,6 +497,8 @@ protected:
   std::vector<PerspectiveObject *> m_perspectiveObjs;
   std::vector<PerspectiveObject *> m_lastPreset;
 
+  bool m_firstTime;
+
   PerspectiveSelection m_selection;
   bool m_selecting;
   TRectD m_selectingRect;

toonz/sources/toonz/viewerdraw.cpp

@@ -41,7 +41,6 @@ TEnv::IntVar ShowRuleOfThirds("ShowRuleOfThirds", 1);
 TEnv::IntVar ShowGoldenRatio("ShowGoldenRatio", 0);
 TEnv::IntVar ShowFieldGuide("ShowFieldGuide", 0);
 TEnv::IntVar GuideOpacity("GuideOpacity", 70);
-TEnv::IntVar ShowPerspectiveGuides("ShowPerspectiveGuides", 0);
 
 /* TODO, move to include */
 void getSafeAreaSizeList(QList<QList<double>> &_sizeList);