Handle invalid positions regardless of the plotinvalid kwarg.

efiring · efiring · commit c0b5013c8984 · 2018-10-06T09:46:57.000-10:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -4240,9 +4240,14 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
         else:
             colors = None  # use cmap, norm after collection is created
 
-        if plotinvalid is False:
-            # `delete_masked_points` only modifies arguments of the same length
-            #  as `x`.
+        if plotinvalid and colors == None:
+            # Do full color mapping; don't remove invalid c entries.
+            ind = np.arange(len(c))
+            x, y, s, ind, colors, edgecolors, linewidths =\
+               cbook.delete_masked_points(
+                   x, y, s, ind, colors, edgecolors, linewidths)
+            c = np.ma.masked_invalid(c[ind])
+        else:
             x, y, s, c, colors, edgecolors, linewidths =\
                cbook.delete_masked_points(
                    x, y, s, c, colors, edgecolors, linewidths)
@@ -4289,12 +4294,7 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
             if norm is not None and not isinstance(norm, mcolors.Normalize):
                 raise ValueError(
                     "'norm' must be an instance of 'mcolors.Normalize'")
-
-            if plotinvalid is False:
-                collection.set_array(c)
-            else:
-                collection.set_array(ma.masked_invalid(c))
-
+            collection.set_array(c)
             collection.set_cmap(cmap)
             collection.set_norm(norm)
 
