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

Remove/replace all UFE_PREVIEW_VERSION_NUM now that latest MayaPR has UFE v3 #2096

Merged
merged 1 commit into from
Feb 11, 2022

Conversation

seando-adsk
Copy link
Collaborator

No description provided.

@seando-adsk seando-adsk added ufe Related to UFE component in Maya unit test Related to unit tests (both python or c++) build Related to building maya-usd repository labels Feb 11, 2022
@seando-adsk
Copy link
Collaborator Author

Last Ufe v3 beta version was 0.3.14.

Maya 2022 == PR 122

Made the following changes:
#if (UFE_PREVIEW_VERSION_NUM >= 3xxx) -> #ifdef UFE_V3_FEATURES_AVAILABLE

@unittest.skipIf(os.getenv('UFE_PREVIEW_VERSION_NUM', '0000') < '3xxx' -> @unittest.skipUnless(ufeFeatureSetVersion() >= 3, 'Test only available in UFE v3 or greater.')

@unittest.skipIf(mayaUtils.previewReleaseVersion() < 123 -> @unittest.skipUnless(mayaUtils.mayaMajorVersion() >= 2023, 'Requires Maya fixes only available in Maya 2023 or greater.')

@@ -35,14 +35,14 @@ namespace ufe {

UsdUndoCreateGroupCommand::UsdUndoCreateGroupCommand(
const UsdSceneItem::Ptr& parentItem,
#if (UFE_PREVIEW_VERSION_NUM < 3005)
#ifndef UFE_V3_FEATURES_AVAILABLE
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This file is only included for Ufe v2. Here we don't want this extra selection arg for Ufe v2.

Copy link
Collaborator

@ppt-adsk ppt-adsk left a comment

Choose a reason for hiding this comment

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

Thanks Sean, code looks cleaner.

@seando-adsk seando-adsk added the ready-for-merge Development process is finished, PR is ready for merge label Feb 11, 2022
@kxl-adsk kxl-adsk merged commit 6e1c88a into dev Feb 11, 2022
@kxl-adsk kxl-adsk deleted the donnels/update_ufe_preview_checks branch February 11, 2022 22:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Related to building maya-usd repository ready-for-merge Development process is finished, PR is ready for merge ufe Related to UFE component in Maya unit test Related to unit tests (both python or c++)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants