From 83f5c8fd00b2a72dae3f41add62f9d65ea7a998a Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Fri, 22 Jan 2016 16:03:57 +0000
Subject: [PATCH] GLOBject validity test fixes.
---
fsl/fsleyes/gl/lightboxcanvas.py | 2 +-
fsl/fsleyes/gl/slicecanvas.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fsl/fsleyes/gl/lightboxcanvas.py b/fsl/fsleyes/gl/lightboxcanvas.py
index 7be390ecc..6f2b78e1a 100644
--- a/fsl/fsleyes/gl/lightboxcanvas.py
+++ b/fsl/fsleyes/gl/lightboxcanvas.py
@@ -371,7 +371,7 @@ class LightBoxCanvas(slicecanvas.SliceCanvas):
globj = self._glObjects.get(overlay, None)
- if globj is None:
+ if (globj is None) or (not globj):
continue
rt, name = self._getPreRenderTexture(globj, overlay)
diff --git a/fsl/fsleyes/gl/slicecanvas.py b/fsl/fsleyes/gl/slicecanvas.py
index 12cc0801e..589add251 100644
--- a/fsl/fsleyes/gl/slicecanvas.py
+++ b/fsl/fsleyes/gl/slicecanvas.py
@@ -463,7 +463,7 @@ class SliceCanvas(props.HasProperties):
globj = self._glObjects.get(overlay, None)
display = self.displayCtx.getDisplay(overlay)
- if globj is None:
+ if (globj is None) or (not globj):
continue
# For offscreen render mode, GLObjects are
@@ -687,7 +687,7 @@ class SliceCanvas(props.HasProperties):
for ovl, globj in self._glObjects.items():
- if globj is not None:
+ if (globj is not None) and globj:
globj.setAxes(self.xax, self.yax)
self._overlayBoundsChanged()
--
GitLab