Release prep for 10.4.6.0 #1340
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
|
I'm not seeing anything here that's scary in the Imath changes, and if the 3delight driver isn't useful currently anyway, I don't really see any problem with just moving forward. |
Collaborator
|
I'd be inclined to agree with Daniel, maybe we just carry on rather than deal with any further complications merging forward after rolling back. Chalk it up to the inevitable price of the convenience of command line surgery... |
This will allow us to use Cortex release packages in Gaffer 1.2.x.
johnhaddon
force-pushed
the
releasePrep-10.4.6.0
branch
from
5a213c6 to
f69a29a
Compare
Member
Author
|
OK, I've checked through all the "bonus" commits once more and do think they're harmless. So I've simplified this PR down to just the version/dependency numps. Will merge once CI gives the OK. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In which John realises he has made a horrible mistake :
mainand notRB-10.4as it should have been.RB-10.4manually on the command line too.maintoo, and therefore contained all the commits frommainas well as the MeshSplitter code we wanted.RB-10.4contains everything frommain.I've "fixed" this in this PR with a commit that reverts everything from that merge. Then I've cherry-picked the MeshSplitter commits we do want, and done the usual commits to bump version and update Changes for a new release. Presumably, I will have to also revert the revert when next merging
RB-10.4tomain.In practice, very little had been done on
mainsince we branchedRB-10.4. The main things I see are removal of a 3Delight display driver (which doesn't work with recent 3Delight any more) and some code changes for Imath 3 (which shouldn't break ABI anyway). So, do verify this for yourself, but it seems possible that we could actually not revert the bad merge, if we were feeling in a positive sort of mood. But I want to provide all options I can, hence the revert commit - let me know if you think it best to keep it or remove it.Daniel, I've tested the cherry-picked MeshSplit stuff in a Gaffer build and all seems well, but please do give it a good check yourself to be sure I've got all the right things.
That leaves the final 3 commits, which are the only bits that would be necessary if I wasn't a colossal plonker.