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

LOOKDEVX-772 Adds outliner icons for shading types #2485

Merged
merged 2 commits into from
Jul 15, 2022
Merged

LOOKDEVX-772 Adds outliner icons for shading types #2485

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e45adfe
LOOKDEVX-772 Adds outliner icons for shading types
JGamache-autodesk Jul 14, 2022
87f57f2
clang-format
JGamache-autodesk Jul 14, 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
2 changes: 2 additions & 0 deletions lib/mayaUsd/resources/icons/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ if (CMAKE_UFE_V2_FEATURES_AVAILABLE)
UsdGeomXformable
UsdTyped
Volume
Material
Shader
)
if (PXR_VERSION GREATER_EQUAL 2111)
list(APPEND OUTLINER_ICONS
Expand Down
Binary file added lib/mayaUsd/resources/icons/out_USD_Material_100.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lib/mayaUsd/resources/icons/out_USD_Material_150.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lib/mayaUsd/resources/icons/out_USD_Material_200.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lib/mayaUsd/resources/icons/out_USD_Shader_100.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lib/mayaUsd/resources/icons/out_USD_Shader_150.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lib/mayaUsd/resources/icons/out_USD_Shader_200.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion lib/mayaUsd/ufe/UsdUIInfoHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,10 @@ Ufe::UIInfoHandler::Icon UsdUIInfoHandler::treeViewIcon(const Ufe::SceneItem::Pt
{ "Skeleton", "out_USD_Skeleton.png" },
{ "SkelRoot", "out_USD_SkelRoot.png" },
{ "Sphere", "out_USD_Sphere.png" },
{ "Volume", "out_USD_Volume.png" }
{ "Volume", "out_USD_Volume.png" },
{ "Material", "out_USD_Material.png"},
{ "NodeGraph", "out_USD_Shader.png"},
{ "Shader", "out_USD_Shader.png"},
};

Ufe::UIInfoHandler::Icon icon; // Default is empty (no icon and no badge).
Expand Down
8 changes: 4 additions & 4 deletions test/lib/ufe/testUIIcons.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ def testUIIcons(self):
('GeometryLight', 'out_USD_UsdLuxNonboundableLightBase.png' if usdVer >= (0, 21, 11) else 'out_USD_UsdLuxLight.png'),
('HermiteCurves', 'out_USD_UsdGeomCurves.png'),
('LightFilter', 'out_USD_LightFilter.png'),
('Material', 'out_USD_UsdTyped.png'),
('Material', 'out_USD_Material.png'),
('MayaReference', 'out_USD_MayaReference.png'),
('Mesh', 'out_USD_Mesh.png'),
('NodeGraph', 'out_USD_UsdTyped.png'),
('NodeGraph', 'out_USD_Shader.png'),
('NurbsCurves', 'out_USD_UsdGeomCurves.png'),
('NurbsPatch', 'out_USD_NurbsPatch.png'),
('OpenVDBAsset', 'out_USD_UsdGeomXformable.png'),
Expand All @@ -122,15 +122,15 @@ def testUIIcons(self):
('RenderSettings', 'out_USD_UsdTyped.png'),
('RenderVar', 'out_USD_UsdTyped.png'),
('Scope', 'out_USD_Scope.png'),
('Shader', 'out_USD_UsdTyped.png'),
('Shader', 'out_USD_Shader.png'),
('SkelAnimation', 'out_USD_SkelAnimation.png'),
('SkelRoot', 'out_USD_SkelRoot.png'),
('Skeleton', 'out_USD_Skeleton.png'),
('SpatialAudio', 'out_USD_UsdGeomXformable.png'),
('Sphere', 'out_USD_Sphere.png'),
('SphereLight', 'out_USD_UsdLuxBoundableLightBase.png' if usdVer >= (0, 21, 11) else 'out_USD_UsdLuxLight.png'),
('Volume', 'out_USD_Volume.png'),
('Xform', 'out_USD_UsdGeomXformable.png')
('Xform', 'out_USD_UsdGeomXformable.png'),
]
if usdVer >= (0, 21, 11):
primTypes.extend([
Expand Down