diff --git a/lib/mayaUsd/resources/icons/CMakeLists.txt b/lib/mayaUsd/resources/icons/CMakeLists.txt index b02f3fae3e..5b2b084f4c 100644 --- a/lib/mayaUsd/resources/icons/CMakeLists.txt +++ b/lib/mayaUsd/resources/icons/CMakeLists.txt @@ -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 diff --git a/lib/mayaUsd/resources/icons/out_USD_Material_100.png b/lib/mayaUsd/resources/icons/out_USD_Material_100.png new file mode 100644 index 0000000000..8d347dea6c Binary files /dev/null and b/lib/mayaUsd/resources/icons/out_USD_Material_100.png differ diff --git a/lib/mayaUsd/resources/icons/out_USD_Material_150.png b/lib/mayaUsd/resources/icons/out_USD_Material_150.png new file mode 100644 index 0000000000..e1ada179ec Binary files /dev/null and b/lib/mayaUsd/resources/icons/out_USD_Material_150.png differ diff --git a/lib/mayaUsd/resources/icons/out_USD_Material_200.png b/lib/mayaUsd/resources/icons/out_USD_Material_200.png new file mode 100644 index 0000000000..b42e5ac03d Binary files /dev/null and b/lib/mayaUsd/resources/icons/out_USD_Material_200.png differ diff --git a/lib/mayaUsd/resources/icons/out_USD_Shader_100.png b/lib/mayaUsd/resources/icons/out_USD_Shader_100.png new file mode 100644 index 0000000000..5b8c3be181 Binary files /dev/null and b/lib/mayaUsd/resources/icons/out_USD_Shader_100.png differ diff --git a/lib/mayaUsd/resources/icons/out_USD_Shader_150.png b/lib/mayaUsd/resources/icons/out_USD_Shader_150.png new file mode 100644 index 0000000000..279d510bc6 Binary files /dev/null and b/lib/mayaUsd/resources/icons/out_USD_Shader_150.png differ diff --git a/lib/mayaUsd/resources/icons/out_USD_Shader_200.png b/lib/mayaUsd/resources/icons/out_USD_Shader_200.png new file mode 100644 index 0000000000..5d78b038b4 Binary files /dev/null and b/lib/mayaUsd/resources/icons/out_USD_Shader_200.png differ diff --git a/lib/mayaUsd/ufe/UsdUIInfoHandler.cpp b/lib/mayaUsd/ufe/UsdUIInfoHandler.cpp index e1925974f1..afacc3fe03 100644 --- a/lib/mayaUsd/ufe/UsdUIInfoHandler.cpp +++ b/lib/mayaUsd/ufe/UsdUIInfoHandler.cpp @@ -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). diff --git a/test/lib/ufe/testUIIcons.py b/test/lib/ufe/testUIIcons.py index 574887a440..cabb69ef57 100644 --- a/test/lib/ufe/testUIIcons.py +++ b/test/lib/ufe/testUIIcons.py @@ -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'), @@ -122,7 +122,7 @@ 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'), @@ -130,7 +130,7 @@ def testUIIcons(self): ('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([