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.

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

MAYA-123507 - PluginLight needs to use the Light Icon instead of falling back to Xform icon #2406

Merged
merged 2 commits into from
Jun 10, 2022

Conversation

seando-adsk
Copy link
Collaborator

MAYA-123507 - PluginLight needs to use the Light Icon instead of falling back to the Xform Icon

  • Added icon for PluginLight.
  • Fix case where AL plugin is not built.
  • Removed unneeded test property.

…ing back to the Xform Icon

* Added icon for PluginLight.
* Fix case where AL plugin is not built.
* Removed unneeded test property.
@seando-adsk seando-adsk changed the title MAYA-123507 - PluginLight needs to use the Light Icon instead of fall… MAYA-123507 - PluginLight needs to use the Light Icon instead of falling back to Xform icon Jun 9, 2022
@seando-adsk seando-adsk requested a review from boudrey June 9, 2022 17:01
@seando-adsk seando-adsk added bug Something isn't working unit test Related to unit tests (both python or c++) labels Jun 9, 2022
@@ -114,7 +112,7 @@ def testUIIcons(self):
('NurbsPatch', 'out_USD_NurbsPatch.png'),
('OpenVDBAsset', 'out_USD_UsdGeomXformable.png'),
('PackedJointAnimation', 'out_USD_SkelAnimation.png'),
('PluginLight', 'out_USD_UsdGeomXformable.png' if usdVer >= (0, 21, 11) else 'out_USD_UsdLuxLight.png'),
('PluginLight', 'out_USD_PluginLight.png' if usdVer >= (0, 21, 11) else 'out_USD_UsdLuxLight.png'),
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PluginLight now has an icon.

Comment on lines +147 to +153
# Special case for node types which are in an AL schema.
# They aren't available when compiling without the AL plugin.
if Usd.SchemaRegistry.IsConcrete(Tf.Type.FindByName('AL_usd_FrameRange')):
primTypes.extend([
('ALExamplePolyCubeNode', 'out_USD_UsdTyped.png'),
('ALFrameRange', 'out_USD_UsdTyped.png')
])
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you build locally without the AL plugin you won't have the schema that defines these two node types.

# Prim Type # Icon file name
('ALExamplePolyCubeNode', 'out_USD_UsdTyped.png'),
('ALFrameRange', 'out_USD_UsdTyped.png'),
# Prim Type # Icon file name
('ALMayaReference', 'out_USD_MayaReference.png'),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about the ALMayaReference? Should it be moved too?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The schema for that one is in lib, so its always there.

boudrey
boudrey previously approved these changes Jun 9, 2022
…ing back to the Xform Icon

* Use PluginLight icon for any USD version.
@@ -182,6 +182,7 @@ Ufe::UIInfoHandler::Icon UsdUIInfoHandler::treeViewIcon(const Ufe::SceneItem::Pt
{ "ALMayaReference", "out_USD_MayaReference.png" }, // Same as mayaRef
{ "Mesh", "out_USD_Mesh.png" },
{ "NurbsPatch", "out_USD_NurbsPatch.png" },
{ "PluginLight", "out_USD_PluginLight.png" },
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops realized (after running preflight) that I forgot to add the icon here. This makes it work no matter what the USD version.

@seando-adsk seando-adsk added the ready-for-merge Development process is finished, PR is ready for merge label Jun 10, 2022
@seando-adsk seando-adsk merged commit db95893 into dev Jun 10, 2022
@seando-adsk seando-adsk deleted the donnels/MAYA-123507/pluginlight_icon branch June 10, 2022 18:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working ready-for-merge Development process is finished, PR is ready for merge unit test Related to unit tests (both python or c++)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants