diff --git a/fsl/fsleyes/gl/gllabel.py b/fsl/fsleyes/gl/gllabel.py index dcc501d01c96e0bff8125b95073f4cc797838282..f976fd984b331ff26309068cb2345bc8bd0cfde7 100644 --- a/fsl/fsleyes/gl/gllabel.py +++ b/fsl/fsleyes/gl/gllabel.py @@ -91,9 +91,9 @@ class GLLabel(globject.GLImageObject): """Returns ``True`` if this ``GLLabel`` is ready to be drawn, ``False`` otherwise. """ - return self.shader is not None and \ - self.imageTexture is not None and \ - self.imageTexture.ready() + return (self.shader is not None and + self.imageTexture is not None and + self.imageTexture.ready()) def addListeners(self): diff --git a/fsl/fsleyes/gl/glvector.py b/fsl/fsleyes/gl/glvector.py index dc86bd4bdeb4f6a49a76ea37ab755d7279bb56a6..c042c78c159b051eb252b434338c3dbe0f5dcf3f 100644 --- a/fsl/fsleyes/gl/glvector.py +++ b/fsl/fsleyes/gl/glvector.py @@ -237,15 +237,15 @@ class GLVector(globject.GLImageObject): """Returns ``True`` if this ``GLVector`` is ready to be drawn, ``False`` otherwise. """ - return all((self.shader is not None, - self.imageTexture is not None, - self.modulateTexture is not None, - self.clipTexture is not None, - self.colourTexture is not None, - self.imageTexture .ready(), - self.modulateTexture.ready(), - self.clipTexture .ready(), - self.colourTexture .ready())) + return (self.shader is not None and + self.imageTexture is not None and + self.modulateTexture is not None and + self.clipTexture is not None and + self.colourTexture is not None and + self.imageTexture .ready() and + self.modulateTexture.ready() and + self.clipTexture .ready() and + self.colourTexture .ready()) def addListeners(self):