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

Fix compilation when UFE_PREVIEW_VERSION_NUM < 2017. #676

Merged
merged 1 commit into from
Jul 22, 2020

Conversation

marsupial
Copy link
Contributor

No description provided.

@ppt-adsk ppt-adsk requested a review from fowlertADSK July 21, 2020 17:32
Copy link
Contributor

@fowlertADSK fowlertADSK left a comment

Choose a reason for hiding this comment

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

Putting my official review as "request changes". If I end up pushing a fix before you get to this then we'll just cancel this one.

Comment on lines 360 to 364
#if UFE_PREVIEW_VERSION_NUM >= 2017
// At this point we know we have 2 arguments to execute the operation.
// itemPath[1] contains the new prim type to create.
return UsdUndoAddNewPrimCommand::create(fItem, itemPath[1], itemPath[1]);
#endif
Copy link
Contributor

Choose a reason for hiding this comment

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

Ok, you are the second person today that has complained about compile issues with this file and we've finally noticed what is wrong here. This change is not correct, what we need to do is remove the #ifdef up on line 37 of this file where we conditionally #include UsdUndoAddNewPrimCommand.h.

What happened was I created the original file and had the #ifdef's to check for version 2017. Then Hamed cleaned it up because that file does work with any version, it did not require the version check at all (my other changes in that PR did require the 2017 ifdef though). But what we missed was that we still had the conditional #include up there, which now fails to build on versions < 2017.

I will go clean that up and push a fix, or if you beat me to it you could always make the change yourself and update this PR. Either way, thanks for helping out.

@marsupial marsupial force-pushed the PR/PR116-compilation branch from 2c83a1c to acc0798 Compare July 21, 2020 18:10
@marsupial marsupial force-pushed the PR/PR116-compilation branch from acc0798 to 0b9f570 Compare July 21, 2020 18:13
@kxl-adsk kxl-adsk merged commit 0ac0ce5 into Autodesk:dev Jul 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants