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

fix #1639 (#1743)

Browse source
This commit is contained in:
shun-iwasawa 2018-02-19 14:04:48 +09:00 committed by masafumi-inoue
parent ad7711e42d
commit 171458b325
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -1,7 +1,6 @@
language: cpp
sudo: required
dist: trusty
group: deprecated-2017Q4 # temporary uses the previous version
install:
- if [[ $TRAVIS_OS_NAME == "osx" ]]; then bash ci-scripts/osx/travis-install.sh; fi
- if [[ $TRAVIS_OS_NAME == "linux" ]]; then bash ci-scripts/linux/travis-install.sh; fi

17
toonz/sources/toonzqt/styleselection.cpp
View file

@ -91,18 +91,13 @@ bool pasteStylesDataWithoutUndo(TPalette *palette, TPaletteHandle *pltHandle,
break;
}
if (palette->getStylePage(styleId) < 0) {
// styleId non e' utilizzato: uso quello
// (cut/paste utilizzato per spostare stili)
// For now styles will be inserted regardless the styleId of copied styles
// are already used in the target palette or not.
styleId = palette->getFirstUnpagedStyle();
if (styleId >= 0)
palette->setStyle(styleId, style);
} else {
// styleId e' gia' utilizzato. ne devo prendere un altro
styleId = palette->getFirstUnpagedStyle();
if (styleId >= 0)
palette->setStyle(styleId, style);
else
styleId = palette->addStyle(style);
}
else
styleId = palette->addStyle(style);
// check the type of the original(copied) style
// If the original is NormalStyle