Skip to content

Commit

Permalink
fix a bug found by flowviewportAPI tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
lanierd-adsk committed Jan 24, 2024
1 parent 4ba3a09 commit 168d09f
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,4 @@ void DataProducerSceneIndexInterfaceImp::setSceneIndexDataFactory(DataProducerSc
sceneIndexDataFactory = &factory;
}

void DataProducerSceneIndexInterfaceImp::ClearDataProducerSceneIndicesThatApplyToAllViewports()
{
std::lock_guard<std::mutex> lockDataProducerSceneIndicesDataPerViewport(dataProducerSceneIndicesThatApplyToAllViewports_mutex);
dataProducerSceneIndicesThatApplyToAllViewports.clear();
}

} //End of namespace FVP_NS_DEF
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ class DataProducerSceneIndexInterfaceImp : public DataProducerSceneIndexInterfac
const std::string& hydraViewportId = PXR_NS::FvpViewportAPITokens->allViewports)override;


FVP_API void ClearDataProducerSceneIndicesThatApplyToAllViewports();

//Called by flow viewport
///hydraViewportSceneIndexAdded is called when a new hydra viewport is created by the ViewportInformationAndSceneIndicesPerViewportDataManager, it's not a callback.
void hydraViewportSceneIndexAdded(const InformationInterface::ViewportInformation& viewportInfo);
Expand Down
3 changes: 0 additions & 3 deletions lib/mayaHydra/mayaPlugin/renderOverride.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -820,9 +820,6 @@ void MtohRenderOverride::ClearHydraResources()
//We don't have any viewport using Hydra any more
Fvp::ViewportInformationAndSceneIndicesPerViewportDataManager::Get().RemoveAllViewportsInformation();

//Remove the data producer scene indices that apply to all viewports
Fvp::DataProducerSceneIndexInterfaceImp::get().ClearDataProducerSceneIndicesThatApplyToAllViewports();

_mayaHydraSceneProducer.reset();
_selectionSceneIndex.Reset();
_selection.reset();
Expand Down

0 comments on commit 168d09f

Please sign in to comment.