Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix wrong raster project palette #1252

Merged
merged 2 commits into from
Oct 26, 2023
Merged

Fix wrong raster project palette #1252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
263be7e
Fix macOS startup project loading
manongjohn Oct 21, 2023
0c78865
Fix raster palette loading on scene switch to different project
manongjohn Oct 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions toonz/sources/tnztools/symmetrytool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,17 +239,6 @@ SymmetryTool::SymmetryTool()
m_color.setId("Color");
m_useLineSymmetry.setId("UseLineSymmetry");
m_preset.setId("SymmetryPreset");

std::wstring wpreset =
QString::fromStdString(SymmetryPreset.getValue()).toStdWString();
if (wpreset != CUSTOM_WSTR) {
initPresets();
if (!m_preset.isValue(wpreset)) wpreset = CUSTOM_WSTR;
m_preset.setValue(wpreset);
SymmetryPreset = m_preset.getValueAsString();
loadPreset();
} else
loadLastSymmetry();
}

//----------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -468,6 +457,21 @@ void SymmetryTool::loadLastSymmetry() {

//----------------------------------------------------------------------------------------------

void SymmetryTool::loadTool() {
std::wstring wpreset =
QString::fromStdString(SymmetryPreset.getValue()).toStdWString();
if (wpreset != CUSTOM_WSTR) {
initPresets();
if (!m_preset.isValue(wpreset)) wpreset = CUSTOM_WSTR;
m_preset.setValue(wpreset);
SymmetryPreset = m_preset.getValueAsString();
loadPreset();
} else
loadLastSymmetry();
}

//----------------------------------------------------------------------------------------------

void SymmetryTool::draw(SceneViewer *viewer) {
TRectD cameraRect = getApplication()
->getCurrentScene()
Expand Down
2 changes: 2 additions & 0 deletions toonz/sources/tnztools/symmetrytool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,8 @@ class SymmetryTool final : public TTool {
void removePreset();
void loadLastSymmetry();

void loadTool() override;

protected:
TPropertyGroup m_prop;
std::vector<SymmetryToolOptionBox *> m_toolOptionsBox;
Expand Down
3 changes: 3 additions & 0 deletions toonz/sources/toonz/iocommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1949,6 +1949,9 @@ bool IoCmd::loadScene(const TFilePath &path, bool updateRecentFile,
}
if (sceneProject && !sceneProject->isCurrent()) {
pm->setCurrentProjectPath(sceneProject->getProjectPath());
// Clear existing raster palette so it forces a reloads of the new project's
// raster palette when loading scene
FullColorPalette::instance()->clear();
// QString currentProjectName = QString::fromStdWString(
// pm->getCurrentProject()->getName().getWideString());
// QString sceneProjectName =
Expand Down
9 changes: 9 additions & 0 deletions toonz/sources/toonz/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,15 @@ int main(int argc, char *argv[]) {
TTool::getTool(T_PerspectiveGrid, TTool::VectorImage);
if (perspectiveTool) perspectiveTool->loadTool();

// Symmetry tool -
splash.showMessage(offsetStr + QObject::tr("Loading Symmetry Guide..."),
Qt::AlignRight | Qt::AlignBottom, Qt::black);
a.processEvents();

TTool *symmetryTool =
TTool::getTool(T_Symmetry, TTool::VectorImage);
if (symmetryTool) symmetryTool->loadTool();

w.setWindowTitle(QString::fromStdString(TEnv::getApplicationFullName()));
if (TEnv::getIsPortable()) {
splash.showMessage(offsetStr + QObject::tr("Starting Tahoma2D..."),
Expand Down