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-111932 no USD prompt during crash #1601

Merged
merged 4 commits into from
Jul 28, 2021

Conversation

pierrebai-adsk
Copy link
Collaborator

  • Detect if the Maya SDK supports the new crash check function.
  • If present, use it to determine if Maya is crashing during auto-save.
  • If Maya is crashing, avoid asking the user and just save the USD data inside the Maya recovery file.

- Detect if the Maya SDk support the new crash check function.
- If present, use it to determine if Maya is crashing durin g auto-save.
- If Maya is crashing, avoid asking the user and just save USD data inside the Maya recovery file.
@pierrebai-adsk pierrebai-adsk added ready-for-merge Development process is finished, PR is ready for merge and removed ready-for-merge Development process is finished, PR is ready for merge labels Jul 27, 2021
if (_batchSaveDelegate && _proxiesToSave.length() > 0) {
if (isCrashing()) {
result = kPartiallyCompleted;
opt = MayaUsd::utils::kSaveToUSDFiles;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Your pull request description says you'll save inside the Maya file when crashing, but your code says save to USD files. Which one should it be?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Is Maya, thanks for catching this.

Copy link
Contributor

@HamedSabri-adsk HamedSabri-adsk left a comment

Choose a reason for hiding this comment

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

Lgtm!

@pierrebai-adsk pierrebai-adsk added the ready-for-merge Development process is finished, PR is ready for merge label Jul 28, 2021
@kxl-adsk
Copy link

@pierrebai-adsk We merged a number of changes. Please resolve merge conflicts and run PF.

@pierrebai-adsk pierrebai-adsk removed the ready-for-merge Development process is finished, PR is ready for merge label Jul 28, 2021
@pierrebai-adsk pierrebai-adsk added ready-for-merge Development process is finished, PR is ready for merge and removed ready-for-merge Development process is finished, PR is ready for merge labels Jul 28, 2021
@pierrebai-adsk
Copy link
Collaborator Author

I'll be honest, I don't understand why clang-format made me reformat MenuBuilder.cpp. It seems to me the line was shorter than 100 columns limit...?

@pierrebai-adsk pierrebai-adsk added the ready-for-merge Development process is finished, PR is ready for merge label Jul 28, 2021
@kxl-adsk kxl-adsk merged commit b7ae646 into dev Jul 28, 2021
@kxl-adsk kxl-adsk deleted the t_bailp/MAYA-111932/no-usd-prompt-during-crash branch July 28, 2021 15:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

None yet

5 participants