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

Merge pull request #3005 from shun-iwasawa/fix_toggle_link_to_studio_palette_to_prevent_edit_immediately

Browse source 
Fix Toggle Link to Studio Palette to Prevent Editing Style Immediately
This commit is contained in:
Rodney 2020-01-11 08:12:50 -07:00 committed by GitHub
commit 32b829f00b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
toonz/sources/toonzlib/palettecontroller.cpp
View file

@ -62,6 +62,14 @@ void PaletteController::setCurrentPalette(TPaletteHandle *paletteHandle) {
// perform signal BROADCASTING to all palette handles implicitly mapping to
// the associated palette:
// in case the handle is not changed, skip the reconnection
if (m_originalCurrentPalette == paletteHandle) {
if (!paletteHandle) return;
m_currentPalette->setPalette(paletteHandle->getPalette(),
paletteHandle->getStyleIndex());
return;
}
if (m_originalCurrentPalette) {
m_originalCurrentPalette->disconnectBroadcasts(m_currentPalette);
m_currentPalette->disconnectBroadcasts(m_originalCurrentPalette);