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

fix maddin200 pointed problems

Browse source
This commit is contained in:
shun-iwasawa 2022-03-15 14:58:34 +09:00 committed by manongjohn
parent c365f34223
commit fb88fabf54
3 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
toonz/sources/common/psdlib/psd.cpp
View file

@ -1294,9 +1294,8 @@ int TPSDParser::getLevelIdByName(std::string levelName) {
levelNameCount++;
}
}
if (lyid == 0 && lyid < 0) lyid = 0;
if (lyid < 0 && lyid != 0)
throw TImageException(m_path, "Layer ID not exists");
if (lyid < 0) throw TImageException(m_path, "Layer ID not exists");
return lyid;
}
int TPSDParser::getFramesCount(int levelId) {

4
toonz/sources/toonz/canvassizepopup.cpp
View file

@ -137,7 +137,7 @@ int getPixelLength(double measuredLength, TMeasure *measure, double dpi,
double inchValue = measure->getCurrentUnit()->convertFrom(measuredLength);
return tround(inchValue * dpi);
}
}
} // namespace
//=============================================================================
// PeggingWidget
//-----------------------------------------------------------------------------
@ -266,7 +266,7 @@ void PeggingWidget::on00() {
m_01->setIcon(m_topPix.transformed(QMatrix().rotate(m_cutLx ? -90 : 90),
Qt::SmoothTransformation));
m_11->setIcon(
m_topRightPix.transformed(QMatrix().rotate(m_cutLx || m_cutLx ? -90 : 90),
m_topRightPix.transformed(QMatrix().rotate(m_cutLx || m_cutLy ? -90 : 90),
Qt::SmoothTransformation));
m_10->setIcon(m_topPix.transformed(QMatrix().rotate(m_cutLy ? 0 : 180),
Qt::SmoothTransformation));

1
toonz/sources/toonzqt/stageschematicnode.cpp
View file

@ -2183,7 +2183,6 @@ void StageSchematicSplineNode::setSchematicNodePos(const QPointF &pos) const {
QPixmap StageSchematicSplineNode::getPixmap() {
return IconGenerator::instance()->getIcon(m_spline);
return QPixmap();
}
//--------------------------------------------------------