BUG: in scatter, check for verts before setting marker to default

efiring · efiring · commit b109635fbd58 · 2016-06-19T10:33:33.000-10:00
Closes #6507
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -3958,15 +3958,15 @@ def scatter(self, x, y, s=None, c=None, marker=None, cmap=None, norm=None,
 
         scales = s   # Renamed for readability below.
 
-        # load default marker from rcParams
-        if marker is None:
-            marker = rcParams['scatter.marker']
-
         # to be API compatible
         if marker is None and not (verts is None):
             marker = (verts, 0)
             verts = None
 
+        # load default marker from rcParams
+        if marker is None:
+            marker = rcParams['scatter.marker']
+
         if isinstance(marker, mmarkers.MarkerStyle):
             marker_obj = marker
         else:
