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

use preference for premultiply option

Browse source
This commit is contained in:
shun_iwasawa 2017-05-23 19:37:37 +09:00
parent a4bcc91cc3
commit 0becbefbda
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
toonz/sources/toonz/iocommand.cpp
View file

@ -2131,9 +2131,6 @@ static int loadPSDResource(IoCmd::LoadResourceArguments &args,
error(QString::fromStdWString(e.getMessage())); error(QString::fromStdWString(e.getMessage()));
} }
if (xl) { if (xl) {
if (xl->getSimpleLevel()) // just in case
xl->getSimpleLevel()->getProperties()->setDoPremultiply(true);
// lo importo nell'xsheet // lo importo nell'xsheet
if (popup->subxsheet() && childXsh) { if (popup->subxsheet() && childXsh) {
childXsh->exposeLevel(0, subCol0, xl); childXsh->exposeLevel(0, subCol0, xl);

7
toonz/sources/toonzlib/preferences.cpp
View file

@ -103,7 +103,7 @@ inline bool formatLess(const Preferences::LevelFormat &a,
//================================================================= //=================================================================
void getDefaultLevelFormats(LevelFormatVector &lfv) { void getDefaultLevelFormats(LevelFormatVector &lfv) {
lfv.resize(1); lfv.resize(2);
{ {
LevelFormat &lf = lfv[0]; LevelFormat &lf = lfv[0];
@ -111,6 +111,11 @@ void getDefaultLevelFormats(LevelFormatVector &lfv) {
lf.m_pathFormat = QRegExp(".+[0-9]{4,4}\\.tga", Qt::CaseInsensitive); lf.m_pathFormat = QRegExp(".+[0-9]{4,4}\\.tga", Qt::CaseInsensitive);
lf.m_options.m_whiteTransp = true; lf.m_options.m_whiteTransp = true;
lf.m_options.m_antialias = 70; lf.m_options.m_antialias = 70;
// for all PSD files, set the premultiply options to layers
lfv[1].m_name = Preferences::tr("Adobe Photoshop");
lfv[1].m_pathFormat = QRegExp("..*\\.psd", Qt::CaseInsensitive);
lfv[1].m_options.m_premultiply = true;
} }
} }