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

Shiboken2 postmerge fixes in Engine #704

Merged
merged 1 commit into from Nov 7, 2021

Conversation

YakoYakoYokuYoku
Copy link
Member

Thanks for submitting a pull request! Please provide enough information so that others can review your pull request. Additionally, make sure you've done all of these things:

PR Description

What type of PR is this? (Check one of the boxes below)

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Improvement (non-breaking change which does not add functionality nor fixes a bug but improves Natron in some way)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • My change requires a change to the documentation
    • I have updated the documentation accordingly

What does this pull request do?

This is a series of fixes after #697 was committed.
After the merge the enums of the Engine typesystem were placed in NatronEngine instead of NatronEngine.Natron, change which breaks scripts that used said enums. This PR amends the regression.
This change also makes the hidden set methods in Int2DParam and Int3DParam private so they are not called where it's not supposed to be.
And lastly the Engine.pro was modified to build with the Shiboken2 binding, which they'll reside in Engine/NatronEngine5.

Show a few screenshots (if this is a visual change)

N/A.

Have you tested your changes (if applicable)? If so, how?

Started Natron with this init.py to assert that the enum was in the correct place.

import NatronEngine

print(NatronEngine.Natron.DisplayChannelsEnum.eDisplayChannelsRGB)
print(NatronEngine.Natron.DisplayChannelsEnum.eDisplayChannelsR)
print(NatronEngine.Natron.DisplayChannelsEnum.eDisplayChannelsG)
print(NatronEngine.Natron.DisplayChannelsEnum.eDisplayChannelsB)
print(NatronEngine.Natron.DisplayChannelsEnum.eDisplayChannelsA)
print(NatronEngine.Natron.DisplayChannelsEnum.eDisplayChannelsY)
print(NatronEngine.Natron.DisplayChannelsEnum.eDisplayChannelsMatte)
NatronEngine.Natron.DisplayChannelsEnum.eDisplayChannelsR
NatronEngine.Natron.DisplayChannelsEnum.eDisplayChannelsG
NatronEngine.Natron.DisplayChannelsEnum.eDisplayChannelsB
NatronEngine.Natron.DisplayChannelsEnum.eDisplayChannelsA
NatronEngine.Natron.DisplayChannelsEnum.eDisplayChannelsY
NatronEngine.Natron.DisplayChannelsEnum.eDisplayChannelsMatte

Tried with natron-python but the thing turned out to be disobedient.

Futher details of this pull request

N/A.

Copy link
Member

@devernay devernay left a comment

Choose a reason for hiding this comment

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

thanks

@devernay devernay merged commit 5aa8be2 into NatronGitHub:RB-2.5 Nov 7, 2021
@YakoYakoYokuYoku YakoYakoYokuYoku deleted the enum-fixup branch November 7, 2021 22:31
devernay added a commit that referenced this pull request Dec 2, 2021
we have to find a shiboken2 solution that doesn't break shiboken1
See #698 #697 #704
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