Merge branch 'bf/tracto-shaders' into 'master'

Bf/tracto shaders

See merge request fsl/fsleyes/fsleyes!318

CHANGELOG.rst

@@ -10,6 +10,18 @@ This document contains the ``fsleyes`` release history in reverse
 chronological order.
 
 
+
+1.4.1 (Tuesday 3rd May 2022)
+----------------------------
+
+
+Fixed
+^^^^^
+
+
+* Fixed an issue with 2D tractogram display on macOS (!318).
+
+
 1.4.0 (Monday 2nd May 2022)
 ---------------------------
 

fsleyes/gl/gl33/gltractogram_funcs.py

@@ -76,7 +76,7 @@ def compileShaders(self):
         const = {
             'colourMode' : colourMode,
             'clipMode'   : clipMode,
-            'lighting'   : True
+            'lighting'   : self.threedee
         }
 
         progs = []

fsleyes/gl/gltractogram.py

@@ -414,7 +414,6 @@ class GLTractogram(globject.GLObject):
                 shader.set('colourScale',  colourScale)
                 shader.set('colourOffset', colourOffset)
                 shader.set('resolution',   opts.resolution)
-                shader.set('lighting',     False)
 
         for shader in self.iterShaders('orientation',
                                        ['vertexData', 'imageData']):
@@ -438,7 +437,6 @@ class GLTractogram(globject.GLObject):
                 shader.set('modulateAlpha', opts.modulateAlpha)
                 shader.set('modScale',      modScale)
                 shader.set('modOffset',     modOffset)
-                shader.set('lighting',      False)
 
 
     def updateColourData(self, refresh=True):