Skip to content
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

Lanierd/hydra 746 #85

Closed
wants to merge 6 commits into from
Closed

Lanierd/hydra 746 #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cc0cbcb
HYDRA-746 : Avoid a crash when mayaHydra is not loaded and update thi…
lanierd-adsk Feb 22, 2024
01e9834
Name change
lanierd-adsk Feb 22, 2024
7a81de9
HYDRA-746 : rename classes and files and avoid crashing when maya hyd…
lanierd-adsk Feb 22, 2024
12e9546
HYDRA-746 : Apply Pierre's changes to this example
lanierd-adsk Mar 4, 2024
534f01b
Fix tests.
lanierd-adsk Mar 5, 2024
260ca02
Use TearDown in tests.
lanierd-adsk Mar 6, 2024
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
2 changes: 1 addition & 1 deletion lib/flowViewport/API/perViewportSceneIndicesData/fvpDataProducerSceneIndexDataBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ void DataProducerSceneIndexDataBase::_CreateSceneIndexChainForDataProducerSceneI
HdSceneIndexBaseRefPtr DataProducerSceneIndexDataBase::_CreateUsdStageSceneIndexChain(HdSceneIndexBaseRefPtr const & inputStageSceneIndex)
{
_CreateSceneIndexChainForDataProducerSceneIndexWithDCCNode(inputStageSceneIndex);
UpdateHydraTransformFromParentPath();//Update the transform, this is useful when deleting the node and undoing it
return _lastSceneIndexChain;
}

Expand All @@ -136,6 +135,7 @@ void DataProducerSceneIndexDataBase::_CreateSceneIndexChainForDataProducerSceneI
{
_rootOverridesSceneIndex = UsdImagingRootOverridesSceneIndex::New(inputSceneIndex);
_lastSceneIndexChain = _rootOverridesSceneIndex;
UpdateHydraTransformFromParentPath();//Update the transform, this is useful when deleting the node and undoing it
}

void DataProducerSceneIndexDataBase::_CreateSceneIndexChainForDataProducerSceneIndexWithoutDCCNode(HdSceneIndexBaseRefPtr const & inputSceneIndex)
Expand Down
2 changes: 1 addition & 1 deletion lib/mayaHydra/flowViewportAPIExamples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
add_subdirectory(flowViewportAPIMayaLocator)
add_subdirectory(flowViewportAPILocator)
4 changes: 2 additions & 2 deletions ...flowViewportAPIMayaLocator/CMakeLists.txt → ...les/flowViewportAPILocator/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set(TARGET_NAME flowViewportAPIMayaLocator)
set(TARGET_NAME mayaHydraFlowViewportAPILocator)

add_library(${TARGET_NAME} SHARED)

Expand All @@ -7,7 +7,7 @@ add_library(${TARGET_NAME} SHARED)
# -----------------------------------------------------------------------------
target_sources(${TARGET_NAME}
PRIVATE
flowViewportAPIMayaLocator.cpp
mhFlowViewportAPILocator.cpp
)

set(HEADERS
Expand Down
Loading
Loading