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-110155: consistent namespace across the project - Part 2 #1231

Merged

Conversation

HamedSabri-adsk
Copy link
Contributor

  • colorSpace
  • blockSceneModificationContext

@HamedSabri-adsk HamedSabri-adsk added the build Related to building maya-usd repository label Mar 3, 2021
@@ -19,16 +19,22 @@

PXR_NAMESPACE_USING_DIRECTIVE
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Forced to keep this here because of "PIXMAYA_LINEAR_COLORS"

@HamedSabri-adsk HamedSabri-adsk added the ready-for-merge Development process is finished, PR is ready for merge label Mar 3, 2021
@@ -207,7 +207,7 @@ MObject PxrMayaHdImagingShape::GetOrCreateInstance()
// We never intend for the imaging shape to get saved out to the Maya scene
// file, so make sure that we preserve the scene modification status from
// before we create the shape.
const UsdMayaBlockSceneModificationContext blockModContext;
const MayaUsd::utils::UsdMayaBlockSceneModificationContext blockModContext;

Choose a reason for hiding this comment

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

Simply a reminder of internal discussion - let's remove the UsdMaya prefix since it's not very useful when the class now lives in the proper namespace.

@kxl-adsk kxl-adsk removed the ready-for-merge Development process is finished, PR is ready for merge label Mar 16, 2021
@kxl-adsk
Copy link

@HamedSabri-adsk please resolve merge conflicts and trigger a PF.

@HamedSabri-adsk HamedSabri-adsk added the ready-for-merge Development process is finished, PR is ready for merge label Mar 22, 2021
@kxl-adsk kxl-adsk merged commit 3971393 into dev Mar 22, 2021
@kxl-adsk kxl-adsk deleted the sabrih/MAYA-110155/consistent_namespace_across_lib_part_2 branch March 22, 2021 18:31
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants