Merge dev with clang format #894
Merged
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
We now explore the UV linkage and make sure the UV stream name in the material matches the UV set name on the shape. We will create as many material specializations as needed to match the shape streams in case of UV stream names inconsistency in a group of shapes sharing a single material. We no longer automatically rename "map1" to "st" since the UV streams in the material will now be correctly set.
…ses AL test to fail * Having multiple proxy shapes can cause re-entrant stage set notif. We need to account for that.
…ses AL test to fail Update based on code review feedback. Co-authored-by: Krystian Ligenza <[email protected]>
…ing items * Outliner was being sent incorrect UFE notif (SubtreeInvalidate) when duplicating an item. It should get ObjectAdd.
The existing call to usdTranslatorImport_SetOptionMenuByAnnotation() was replaced with a call to usdTranslatorImport_SetShadingOptionMenuByAnnotation() in #865, but the latter does not exist anywhere. This reverts that change.
Correctly detect and handle UDIM on import and export.
…uffer-as-requested-by-material MAYA-107785 Prepare CPV buffer if requested by USD material.
…_handling fix call to non-existent function in pxrUsd plugin's usdTranslatorImport
…flag_public Make WANT_UFE_BUILD def public.
…export MAYA-106486 Handle UV linkage on material export
…_export MAYA-106486 UDIM Import/Export
…es_not_update_when_duplicating_items MAYA-107246 - USD: outliner does not update when duplicating items
…tialization_order_warning Enable initialization order warning on Windows.
…nfiguration Include all mayaUsd targets in maya-usd repository category
…_real Apply clang format
…/merge_dev_with_clang_format
…/merge_dev_with_clang_format
|
@ppt-adsk There shouldn't be any need to review it since it's a simple merge, but can you make sure it compiles correctly for you? |
It does. Great job in getting this through. |
ppt-adsk
approved these changes
Nov 5, 2020
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.
Used instructions from #890