incorporate #16822

brunobeltran · brunobeltran · commit fea08e89dd81 · 2020-03-18T15:59:23.000-07:00
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
@@ -326,22 +326,27 @@ def make_compound_path_from_polys(cls, XY):
 
     @classmethod
     def make_compound_path(cls, *args):
-        """Make a compound path from a list of Path objects."""
+        """
+        Make a compound path from a list of Path objects. Blindly removes all
+        Path.STOP control points.
+        """
         # Handle an empty list in args (i.e. no args).
         if not args:
             return Path(np.empty([0, 2], dtype=np.float32))
-
         vertices = np.concatenate([x.vertices for x in args])
         codes = np.empty(len(vertices), dtype=cls.code_type)
         i = 0
         for path in args:
-            codes = path.codes
-            if codes is None:
-                codes = np.full(len(path.vertices), Path.LINETO,
-                                dtype=Path.code_type)
-                codes[0] = Path.MOVETO  # so concatenated strokes stay separate
-            codes[i:i + len(path.codes)] = codes
+            if path.codes is None:
+                codes[i] = cls.MOVETO
+                codes[i + 1:i + len(codes)] = cls.LINETO
+            else:
+                codes[i:i + len(path.codes)] = path.codes
             i += len(path.vertices)
+        # remove STOP's, since internal STOPs are a bug
+        not_stop_mask = codes != cls.STOP
+        vertices = vertices[not_stop_mask, :]
+        codes = codes[not_stop_mask]
 
         return cls(vertices, codes)
 
