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

OCIO contexts round 2 #1988

Merged
merged 6 commits into from Mar 2, 2017
Merged

Conversation

johnhaddon
Copy link
Member

This is a squashing of @lucienfostier's work from #1984, plus a UI tweak I've added so that the user can only add string context plugs.

Lucien, everything here should be as you left it, except the following :

  • Fixed bug whereby m_hasContextPlug wasn't initialised to false where necessary
  • Made the ocioContext() method private and non-virtual
  • Added the custom UI for adding strings only
  • Cleaned up a bit of trailing whitespace

Could you give it a quick check over and let me know if all is as you intended?

Cheers...
John

@johnhaddon johnhaddon mentioned this pull request Mar 1, 2017
@lucienfostier
Copy link
Collaborator

Thanks john,

loops good to me!

@johnhaddon johnhaddon merged commit 5e41e0e into GafferHQ:master Mar 2, 2017
@johnhaddon johnhaddon deleted the ocioContextForMerge branch March 3, 2017 09:49
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.

None yet

2 participants