2 files changed, 8 insertions, 9 deletions
diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowManager.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowManager.cpp
index 2821cf8e..9b52667b 100644
--- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowManager.cpp
+++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowManager.cpp
@@ -91,18 +91,17 @@ RowTree *RowManager::createRowFromBinding(ITimelineItemBinding *binding, RowTree
                                 binding->GetTimelineItem()->GetName().toQString(),
                                 QString(), index);
 
+    // connect the new row and its binding
+    binding->setRowTree(newRow);
+    newRow->setBinding(binding);
+
     // hide if material container
-    const QString matContainerName = g_StudioApp.GetCore()->GetDoc()->GetStudioSystem()
-                                     ->GetClientDataModelBridge()->getMaterialContainerName();
-    if (newRow->rowType() == OBJTYPE_MATERIAL && newRow->label() == matContainerName) {
+    auto bridge = g_StudioApp.GetCore()->GetDoc()->GetStudioSystem()->GetClientDataModelBridge();
+    if (bridge->isMaterialContainer(newRow->instance())) {
         newRow->setVisible(false);
         newRow->rowTimeline()->setVisible(false);
     }
 
-    // connect the new row and its binding
-    binding->setRowTree(newRow);
-    newRow->setBinding(binding);
-
     // set row start/end time & color
     ITimelineTimebar *timebar = binding->GetTimelineItem()->GetTimebar();
     RowTimeline *rowTimeline = newRow->rowTimeline();
diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTree.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTree.cpp
index 1d54b64c..21281e42 100644
--- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTree.cpp
+++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTree.cpp
@@ -706,7 +706,7 @@ bool RowTree::isInVariantsFilter() const
 void RowTree::updateFilter()
 {
     auto bridge = g_StudioApp.GetCore()->GetDoc()->GetStudioSystem()->GetClientDataModelBridge();
-    if (m_rowType == OBJTYPE_MATERIAL && m_label == bridge->getMaterialContainerName())
+    if (bridge->isMaterialContainer(instance()))
         return;
 
     bool parentOk = !m_parentRow || m_parentRow->isVisible();
@@ -920,7 +920,7 @@ void RowTree::updateLabel()
 void RowTree::setRowVisible(bool visible)
 {
     auto bridge = g_StudioApp.GetCore()->GetDoc()->GetStudioSystem()->GetClientDataModelBridge();
-    if (m_rowType == OBJTYPE_MATERIAL && m_label == bridge->getMaterialContainerName())
+    if (bridge->isMaterialContainer(instance()))
         return;
 
     if (visible) {