Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
hg update 8de0e6e527c6hg pull -r devel-pythonglrendererbindings https://bitbucket.org/Ident8/python-opengl-texture-not-wrapped# Note: This will create a new head!hg merge devel-pythonglrendererbindingshg commit -m 'Merged in Ident8/python-opengl-texture-not-wrapped/devel-pythonglrendererbindings (pull request #148)'
Couple of minor formatting issues, other than that it looks fine.
I think it would be best if we kept the author info in the commit. This way it looks like you wrote it and that is unfair to dermont, the original author.
what needs to be formatted? i will add the author info in the follow-up commit.
I have formatted it and added GLM. As a reminder: We need some sort of ifdef switch for the different GL texture types otherwise this won't work on all systems (currently it doesnt work on Windows due to X11 from the GLXPBTextureTarget.h)