Restrict namespace edits to current stage #2977
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
This is needed for the calls to std::once_flag and std::call_once
When authoring namespace edits across layers, restrict the targets to layers within your current usd stage. This avoids trying the edit across references, inherits, payloads, etc, which will often times be illegal.
dj-mcg
changed the title
| @@ -20,6 +20,8 @@ | |||
| #include <pxr/usd/usd/tokens.h> | |||
| #include <pxr/usd/usdUI/tokens.h> | |||
|
|
|||
| #include <mutex> | |||
There was a problem hiding this comment.
No sure why this file got modified, was this to fix a build issue?
There was a problem hiding this comment.
Yeah, I couldn't build locally without that change. It's PR'd here:
#2975
pierrebai-adsk
previously approved these changes
Mar 29, 2023
| @@ -116,16 +116,33 @@ void enforceMutedLayer(const PXR_NS::UsdPrim& prim, const char* command) | |||
| } | |||
| } | |||
|
|
|||
| static SdfPrimSpecHandleVector _GetLocalPrimStack(const UsdPrim& prim) | |||
There was a problem hiding this comment.
ON second thought, maybe adding a comments on what this code is trying to avoid, like the description you gave in teh bug would be helpful for future coders.
There was a problem hiding this comment.
I too the liberty of adding the comment myself to your branch.
Add a comment to explain the code that only affect local layers.
pierrebai-adsk
approved these changes
Mar 29, 2023
seando-adsk
added
workflows
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.
This will restrict namespace edits to your current usd stage. This avoids the issue of spanning references and inherits, etc, which will often be illegal operations. This addresses the issue I posted here:
#2953