MAYA-129260 - MayaUsd: make building with Ufe mandatory and remove v1 support #3217
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… support * cmake/doc changes to remove optional building with Ufe.
… support * code changes to remove "WANT_UFE_BUILD" conditional.
… support * code changes to remove hard-coded ufe runtime id
… support * cmake changes to remove conditional Ufe v2
… support * code changes to remove conditional Ufe v2
… support * Replace UFE_NS with "Ufe"
… support * Don't need "UsdTransform3d/UsdTransform3dHandler/ToggleTransform3d". These were hack for Ufe v1 support.
seando-adsk
added
ufe
… support * clang-format
seando-adsk
commented
Jul 10, 2023
| message(STATUS "UFE not found. UFE features will be disabled.") | ||
| endif() | ||
| endif() | ||
| find_package(UFE 0.2.0 REQUIRED) |
There was a problem hiding this comment.
Ufe is not mandatory and we must find at least v2 (for Maya 2022).
| Ufe::Transform3dHandler::Ptr g_OldTransform3dHandler; | ||
| Ufe::Transform3dHandler::Ptr g_NewTransform3dHandler; | ||
|
|
||
| class ToggleTransform3d : public MPxCommand |
There was a problem hiding this comment.
This command was a hack used to revert to Maya 2020 behavior. We don't support this anymore. That means we no longer need the UsdTransform3dHandler and UsdTransform3d.
doc/codingGuidelines.md
Outdated
| @@ -227,8 +227,8 @@ Headers should be included in the following order, with each section separated b | |||
|
|
|||
| #include <string> | |||
|
|
|||
| #if defined(WANT_UFE_BUILD) | |||
| #include <ufe/ufe.h> | |||
| #ifdef UFE_V2_FEATURES_AVAILABLE | |||
There was a problem hiding this comment.
Do we still need the UFE_V2_FEATURES_AVAILABLE flag if we can only build with UFE V2 available?
There was a problem hiding this comment.
Ah right, this flag will always be available in ufe.h, but I should have used the V3 one here.
… support * Code review feedback - use Ufe V3 define.
samuelliu-adsk
approved these changes
Jul 18, 2023
| #include <ufe/rtid.h> | ||
| #endif | ||
|
|
||
| #include <pxr/base/tf/refPtr.h> |
There was a problem hiding this comment.
Should this line be deleted?
seando-adsk
added
the
ready-for-merge
seando-adsk
deleted the
donnels/MAYA-129260/make_building_with_ufe_mandatory
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
MAYA-129260 - MayaUsd: make building with Ufe mandatory and remove v1 support
I split the work into smaller chunks, thus the 7 commits. It might be easier to review if you look at each commit separately.
commit 1: 6e409b6: cmake/doc changes to remove optional building with Ufe.
commit 2: f3c633b: code changes to remove "WANT_UFE_BUILD" conditional.
commit 3: 869f652: code changes to remove hard-coded ufe runtime id
commit 4: a04265d: cmake changes to remove conditional Ufe v2
commit 5: 30de1c1: code changes to remove conditional Ufe v2
commit 6: 03c78ae: Replace UFE_NS with "Ufe"
commit 7: e9eb1f9: Don't need "UsdTransform3d/UsdTransform3dHandler/ToggleTransform3d". These were hack for Ufe v1 support.