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

Add contextual menu to create material nodes #2466

Merged
merged 8 commits into from
Jul 11, 2022
Merged

Add contextual menu to create material nodes #2466

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
19efb65
LOOKDEVX-730 | Added new interface for creating materials/material
feldstj Jul 5, 2022
f1cb54d
Merge branch 'dev' into feldstj/create_material_node
JGamache-autodesk Jul 5, 2022
a2140f9
Completed implementation
JGamache-autodesk Jul 7, 2022
c8bf6ad
Merge remote-tracking branch 'github/dev' into feldstj/create_materia…
JGamache-autodesk Jul 7, 2022
2e1cb2c
Fix builds on older Ufe versions
JGamache-autodesk Jul 8, 2022
3d2862a
Properly check for UFE versions
JGamache-autodesk Jul 8, 2022
5667d0b
Rework from review comments.
JGamache-autodesk Jul 8, 2022
e82bc40
Use CompositeCmd everywhere
JGamache-autodesk Jul 8, 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
29 changes: 20 additions & 9 deletions lib/mayaUsd/ufe/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,13 @@ if(CMAKE_UFE_V4_FEATURES_AVAILABLE)
endif()
endif()

if(PXR_VERSION GREATER_EQUAL 2108)
target_sources(${PROJECT_NAME}
PRIVATE
UsdUndoMaterialCommands.cpp
)
endif()

set(HEADERS
Global.h
ProxyShapeHandler.h
Expand Down Expand Up @@ -214,15 +221,6 @@ if (UFE_LIGHTS_SUPPORT)
)
endif()

if(CMAKE_UFE_V4_FEATURES_AVAILABLE)
if (${UFE_PREVIEW_VERSION_NUM} GREATER_EQUAL 4020)
list(APPEND HEADERS
UsdConnections.h
UsdConnectionHandler.h
)
endif()
endif()

if(CMAKE_UFE_V4_FEATURES_AVAILABLE)
if (${UFE_PREVIEW_VERSION_NUM} GREATER_EQUAL 4001)
list(APPEND HEADERS
Expand All @@ -244,6 +242,19 @@ if(CMAKE_UFE_V4_FEATURES_AVAILABLE)
ProxyShapeSceneSegmentHandler.h
)
endif()

if (${UFE_PREVIEW_VERSION_NUM} GREATER_EQUAL 4020)
list(APPEND HEADERS
UsdConnections.h
UsdConnectionHandler.h
)
endif()
endif()

if(PXR_VERSION GREATER_EQUAL 2108)
list(APPEND HEADERS
UsdUndoMaterialCommands.h
)
endif()

# -----------------------------------------------------------------------------
Expand Down
Loading