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-107273 - As a user, on the stage AE template I'd like to see Pur… #1178

Merged
merged 2 commits into from
Feb 19, 2021

Conversation

spinell-adsk
Copy link
Contributor

…pose in the Stage Display section

  • Merge the drawGuidePurpose, drawProxyPurpose, drawRenderPurpose attribute into a "Purpose" checkBoxGrp

…pose in the Stage Display section

- Merge the drawGuidePurpose, drawProxyPurpose, drawRenderPurpose attribute into a "Purpose" checkBoxGrp
@kxl-adsk kxl-adsk added the proxy Related to base proxy shape label Feb 16, 2021
Copy link
Collaborator

@seando-adsk seando-adsk left a comment

Choose a reason for hiding this comment

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

Great work. Thanks. As an FYI, I have moved all the content of this file to a new Base template and then this file just includes the base. So you might need to resolve conflicts if my PR gets merged first.

@spinell-adsk spinell-adsk added the ready-for-merge Development process is finished, PR is ready for merge label Feb 17, 2021
@seando-adsk
Copy link
Collaborator

@spinell-adsk My PR (which moved all the code into a new base template file) was merged first. So you'll need to update your PR to make the change in the new template file AEmayaUsdProxyShapeBaseTemplate.mel.

# Conflicts:
#	plugin/adsk/scripts/AEmayaUsdProxyShapeTemplate.mel
@kxl-adsk kxl-adsk merged commit 87f1583 into dev Feb 19, 2021
@kxl-adsk kxl-adsk deleted the spinell/MAYA-107273/ae_purpose_field branch February 19, 2021 20:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
proxy Related to base proxy shape 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