From 3349155f825665f0fb685d9c296a0f4b2f701b9c Mon Sep 17 00:00:00 2001 From: manongjohn <19245851+manongjohn@users.noreply.github.com> Date: Sun, 14 Aug 2022 16:48:26 -0400 Subject: [PATCH] Show parent on Palette columns --- toonz/sources/toonz/xshcolumnviewer.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/toonz/sources/toonz/xshcolumnviewer.cpp b/toonz/sources/toonz/xshcolumnviewer.cpp index 8468c1dd..886a9fa9 100644 --- a/toonz/sources/toonz/xshcolumnviewer.cpp +++ b/toonz/sources/toonz/xshcolumnviewer.cpp @@ -1270,8 +1270,7 @@ void ColumnArea::DrawHeader::drawPegbarName() const { p.setPen(m_viewer->getVerticalLineColor()); if (o->flag(PredefinedFlag::PEGBAR_NAME_BORDER)) p.drawRect(pegbarnamerect); - if (column->getSoundColumn() || column->getSoundTextColumn() || - column->getPaletteColumn()) + if (column->getSoundColumn() || column->getSoundTextColumn()) return; if (Preferences::instance()->isParentColorsInXsheetColumnEnabled() && @@ -1306,8 +1305,7 @@ void ColumnArea::DrawHeader::drawPegbarName() const { void ColumnArea::DrawHeader::drawParentHandleName() const { if (col < 0 || isEmpty || !o->flag(PredefinedFlag::PARENT_HANDLE_NAME_VISIBILE) || - column->getSoundColumn() || column->getSoundTextColumn() || - column->getPaletteColumn()) + column->getSoundColumn() || column->getSoundTextColumn()) return; TStageObjectId columnId = m_viewer->getObjectId(col);