razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Fix env variables resetting on restart

Browse source
This commit is contained in:
manongjohn 2021-11-30 21:25:22 -05:00
parent 34eaa5dc95
commit 9c19d512d6
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
toonz/sources/tnztools/perspectivetool.cpp
View file

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

3
toonz/sources/tnztools/perspectivetool.h
View file

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

1
toonz/sources/toonz/viewerdraw.cpp
View file

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