Fix #4700: Use overlay by default

matplotlib · tacaswell · Feb 8, 2016 · Jul 10, 2015 · Jul 10, 2015 · Nov 6, 2015
commit 451318277b8d8948fa038e93fcffe50f5898a8f6
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -1598,7 +1598,7 @@ def hillshade(self, elevation, vert_exag=1, dx=1, dy=1, fraction=1.):
 
         return intensity
 
-    def shade(self, data, cmap, norm=None, blend_mode='hsv', vmin=None,
+    def shade(self, data, cmap, norm=None, blend_mode='overlay', vmin=None,
               vmax=None, vert_exag=1, dx=1, dy=1, fraction=1, **kwargs):
         """
         Combine colormapped data values with an illumination intensity map
@@ -1618,15 +1618,16 @@ def shade(self, data, cmap, norm=None, blend_mode='hsv', vmin=None,
             The normalization used to scale values before colormapping. If
             None, the input will be linearly scaled between its min and max.
         blend_mode : {'hsv', 'overlay', 'soft'} or callable, optional
-            The type of blending used to combine the colormapped data values
-            with the illumination intensity.  For backwards compatibility, this
-            defaults to "hsv". Note that for most topographic surfaces,
+            The type of blending used to combine the colormapped data
+            values with the illumination intensity.  Default is
+            "overlay".  Note that for most topographic surfaces,
             "overlay" or "soft" appear more visually realistic. If a
-            user-defined function is supplied, it is expected to combine an
-            MxNx3 RGB array of floats (ranging 0 to 1) with an MxNx1 hillshade
-            array (also 0 to 1).  (Call signature `func(rgb, illum, **kwargs)`)
-            Additional kwargs supplied to this function will be passed on to
-            the *blend_mode* function.
+            user-defined function is supplied, it is expected to
+            combine an MxNx3 RGB array of floats (ranging 0 to 1) with
+            an MxNx1 hillshade array (also 0 to 1).  (Call signature
+            `func(rgb, illum, **kwargs)`) Additional kwargs supplied
+            to this function will be passed on to the *blend_mode*
+            function.
         vmin : scalar or None, optional
             The minimum value used in colormapping *data*. If *None* the
             minimum value in *data* is used. If *norm* is specified, then this

diff --git a/...matplotlib/tests/baseline_images/test_streamplot/streamplot_masks_and_nans_test_image.pdf b/...matplotlib/tests/baseline_images/test_streamplot/streamplot_masks_and_nans_test_image.pdf
diff --git a/.../tests/baseline_images/test_streamplot/streamplot_masks_and_nans_test_image.png b/.../tests/baseline_images/test_streamplot/streamplot_masks_and_nans_test_image.png