Closed pmolodo closed 5 years ago
Hi @elrond79 - we decided to merge #133 and this PR separately, so we will probably drop #143 (thanks for preparing that one though!). Would you mind resolving the conflict in here again so we can merge this on its own? Cheers
Hey - I just pushed the merge commit from #143 onto this branch, so it's all here for tracking... is that what you wanted? Or did you mean you wanted me to do a rebase?
Hi @elrond79 ,
yes if you could rebase (or squash) your work against develop
that would be much appreciated (we're ready to merge it).
Ok, rebased!
Description (this won't be part of the changelog)
This branches off of https://github.com/AnimalLogic/AL_USDMaya/pull/12, so may want to check that PR first...
Changelog
Changed
Fixed
Checklist (Please do not remove this line)