NatronGitHub / Natron

Open-source video compositing software. Node-graph based. Similar in functionalities to Adobe After Effects and Nuke by The Foundry.
http://NatronGitHub.github.io
GNU General Public License v2.0
4.65k stars 338 forks source link

Shiboken2 postmerge fixes in Engine #704

Closed YakoYakoYokuYoku closed 2 years ago

YakoYakoYokuYoku commented 2 years ago

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)

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.