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

Hide orphaned pulled nodes on ancestor structure change. #2576

Merged
merged 8 commits into from
Sep 28, 2022
Merged

Hide orphaned pulled nodes on ancestor structure change. #2576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ca70462
Hide orphaned pulled nodes on ancestor structure change.
ppt-adsk Aug 12, 2022
3d79000
Fix incorrect logic in removePullParent().
ppt-adsk Sep 2, 2022
ef78fdd
Refactoring and undo / redo fixes.
ppt-adsk Sep 9, 2022
4b6b920
clang-format
ppt-adsk Sep 9, 2022
1f49cea
UNIX compilation fix, partial 2023 fix.
ppt-adsk Sep 12, 2022
4da800c
Another UFE v3/v4 compatibility fix.
ppt-adsk Sep 12, 2022
aa8b425
UFE v3/v4 compatibility fix #3
ppt-adsk Sep 12, 2022
890c0b7
Maya 2023.2 and 2023.3 fixes.
ppt-adsk Sep 26, 2022
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
9 changes: 9 additions & 0 deletions cmake/modules/FindUFE.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,12 @@ if (UFE_INCLUDE_DIR AND EXISTS "${UFE_INCLUDE_DIR}/ufe/sceneSegmentHandler.h")
set(UFE_SCENE_SEGMENT_SUPPORT TRUE CACHE INTERNAL "ufeSceneSegment")
message(STATUS "Maya has UFE scene segment API")
endif()

set(UFE_TRIE_NODE_HAS_CHILDREN_COMPONENTS_ACCESSOR FALSE CACHE INTERNAL "ufeTrieNodeHasChildrenComponentsAccessor")
if(UFE_INCLUDE_DIR AND EXISTS "${UFE_INCLUDE_DIR}/ufe/trie.h")
file(STRINGS ${UFE_INCLUDE_DIR}/ufe/trie.h UFE_HAS_API REGEX "childrenComponents")
if(UFE_HAS_API)
set(UFE_TRIE_NODE_HAS_CHILDREN_COMPONENTS_ACCESSOR TRUE CACHE INTERNAL "ufeTrieNodeHasChildrenComponentsAccessor")
message(STATUS "Maya has UFE TrieNode childrenComponents accessor")
endif()
endif()
19 changes: 19 additions & 0 deletions lib/mayaUsd/fileio/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,19 @@ if(CMAKE_UFE_V3_FEATURES_AVAILABLE)
)
endif()

if(UFE_TRIE_NODE_HAS_CHILDREN_COMPONENTS_ACCESSOR)
target_sources(${PROJECT_NAME}
PRIVATE
orphanedNodesManager.cpp
)

target_compile_definitions(${PROJECT_NAME}
PRIVATE
HAS_ORPHANED_NODES_MANAGER=1
)
endif()


set(HEADERS
fallbackPrimReader.h
functorPrimReader.h
Expand Down Expand Up @@ -78,6 +91,12 @@ if(CMAKE_UFE_V3_FEATURES_AVAILABLE)
)
endif()

if(UFE_TRIE_NODE_HAS_CHILDREN_COMPONENTS_ACCESSOR)
list(APPEND HEADERS
orphanedNodesManager.h
)
endif()

# -----------------------------------------------------------------------------
# promoted headers
# -----------------------------------------------------------------------------
Expand Down
Loading