diff options
author | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2019-07-09 10:20:20 +0200 |
---|---|---|
committer | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2019-07-09 10:20:20 +0200 |
commit | 654a6ac93513c3cc1ef97cacd782ff674c6f4559 (patch) | |
tree | 3b986e4972de7c57fa465820367602fc34bcb0d3 /silx/gui/_glutils/__init__.py | |
parent | a763e5d1b3921b3194f3d4e94ab9de3fbe08bbdd (diff) |
New upstream version 0.11.0+dfsg
Diffstat (limited to 'silx/gui/_glutils/__init__.py')
-rw-r--r-- | silx/gui/_glutils/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/silx/gui/_glutils/__init__.py b/silx/gui/_glutils/__init__.py index 15e48e1..e88affd 100644 --- a/silx/gui/_glutils/__init__.py +++ b/silx/gui/_glutils/__init__.py @@ -1,7 +1,7 @@ # coding: utf-8 # /*########################################################################## # -# Copyright (c) 2014-2017 European Synchrotron Radiation Facility +# Copyright (c) 2014-2019 European Synchrotron Radiation Facility # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -34,9 +34,10 @@ __date__ = "25/07/2016" # OpenGL convenient functions from .OpenGLWidget import OpenGLWidget # noqa -from .Context import getGLContext, setGLContextGetter # noqa +from . import Context # noqa from .FramebufferTexture import FramebufferTexture # noqa from .Program import Program # noqa from .Texture import Texture # noqa from .VertexBuffer import VertexBuffer, VertexBufferAttrib, vertexBuffer # noqa from .utils import sizeofGLType, isSupportedGLType, numpyToGLType # noqa +from .utils import segmentTrianglesIntersection # noqa |