Skip to content

EMSUSD-3823 fix layer content refresh #4655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seando-adsk merged 1 commit into from
Jun 22, 2026
Merged

EMSUSD-3823 fix layer content refresh #4655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions lib/usd/ui/layerEditor/layerEditorWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,13 @@ QLayout* LayerEditorWidget::setupLayout_toolbar()
this,
&LayerEditorWidget::onLazyUpdateLayerContents);

// update layer contents widget on selected layer data change
connect(
_treeView->layerTreeModel(),
&LayerTreeModel::selectedLayerDataChangedSignal,
this,
&LayerEditorWidget::onLazyUpdateLayerContents);

_buttons._loadLayer = addHIGButton(
":/UsdLayerEditor/import_layer",
StringResources::getAsQString(StringResources::kLoadExistingLayer),
Expand Down
12 changes: 9 additions & 3 deletions lib/usd/ui/layerEditor/layerTreeModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,11 +294,12 @@ void LayerTreeModel::setSessionState(SessionState* in_sessionState)
this,
&LayerTreeModel::autoHideSessionLayerChanged);

rebuildModelOnIdle();
rebuildModelOnIdle(true);
}

void LayerTreeModel::rebuildModelOnIdle()
void LayerTreeModel::rebuildModelOnIdle(bool dataChanged)
{
_selectedLayerDataChanged |= dataChanged;
if (!_rebuildOnIdlePending) {
_rebuildOnIdlePending = true;
QTimer::singleShot(0, this, [this]() {
Expand All @@ -313,6 +314,11 @@ void LayerTreeModel::rebuildModel(bool refreshLockState /*= false*/)
_rebuildOnIdlePending = false;
_lastAskedAnonLayerNameSinceRebuild = 0;

if (_selectedLayerDataChanged) {
Q_EMIT selectedLayerDataChangedSignal();
_selectedLayerDataChanged = false;
}

if (!_sessionState->isValid()) {
if (rowCount() > 0) {
// Note: clear() calls beginResetModel and endResetModel for us.
Expand Down Expand Up @@ -472,7 +478,7 @@ void LayerTreeModel::usd_layerChanged(SdfNotice::LayersDidChangeSentPerLayer con
{
// experienced crashes in python prototype For now, rebuild everything
if (!_blockUsdNotices)
rebuildModelOnIdle();
rebuildModelOnIdle(true);
}

// notification from USD
Expand Down
4 changes: 3 additions & 1 deletion lib/usd/ui/layerEditor/layerTreeModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ class LayerTreeModel

Q_SIGNALS:
void selectLayerSignal(const QModelIndex&);
void selectedLayerDataChangedSignal();

protected:
// slots
Expand All @@ -149,8 +150,9 @@ class LayerTreeModel

mutable int _lastAskedAnonLayerNameSinceRebuild = 0;

void rebuildModelOnIdle();
void rebuildModelOnIdle(bool dataChanged = false);
bool _rebuildOnIdlePending = false;
bool _selectedLayerDataChanged = false;
void rebuildModel(bool refreshLockState = false);

void updateTargetLayer(InRebuildModel inRebuild);
Expand Down
Loading