Skip to content

Conversation

@ericmehl
Copy link
Collaborator

This fixes an error on Windows related to the escaping of backslashes that prevented USD from loading IECoreUSD.dll. It was testing correctly in the past because the tests use a different pluginfo.json than what is installed, which was formatted correctly.

Breaking Changes

None

Checklist

  • I have read the contribution guidelines.
  • I have updated the documentation, if applicable.
  • I have tested my change(s) in the test suite, and added new test cases where necessary.
  • My code follows the Cortex project's prevailing coding style and conventions.

Copy link
Member

@johnhaddon johnhaddon left a comment

Choose a reason for hiding this comment

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

LGTM. Not sure why the Windows CI failed - seems unrelated to this. Also needs a rebase to fix a merge conflict..

@ericmehl ericmehl changed the base branch from RB-10.4 to RB-10.3 October 18, 2022 22:31
@ericmehl
Copy link
Collaborator Author

I rebased it onto 10.3 and retargeted the PR to that also. Technically this is a bug fix and I suppose there may be someone out there using 10.3 on Windows.

Would it make more sense / be easier to just keep it on 10.4?

@johnhaddon johnhaddon merged commit a59945a into ImageEngine:RB-10.3 Oct 19, 2022
@johnhaddon
Copy link
Member

Would it make more sense / be easier to just keep it on 10.4?

I suspect it's not needed on 10.3, but there's no bother having it there - we merge everything through from 10.3 to 10.4 regularly anyway...

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.

2 participants