matplotlib
diff --git a/‎lib/matplotlib/legend_handler.py
+8-2 b/‎lib/matplotlib/legend_handler.py
+8-2
diff --git a/‎lib/matplotlib/patches.py
+1 b/‎lib/matplotlib/patches.py
+1
diff --git a/‎lib/matplotlib/tests/baseline_images/test_legend/hatching.pdf
11.2 KB b/‎lib/matplotlib/tests/baseline_images/test_legend/hatching.pdf
11.2 KB
diff --git a/‎lib/matplotlib/tests/baseline_images/test_legend/hatching.png
38.6 KB b/‎lib/matplotlib/tests/baseline_images/test_legend/hatching.png
38.6 KB
@@ -592,6 +592,8 @@ class HandlerPolyCollection(HandlerBase):
     """
     def _update_prop(self, legend_handle, orig_handle):
         def first_color(colors):
+            if colors is None:
+                return None
             colors = mcolors.to_rgba_array(colors)
             if len(colors):
                 return colors[0]
@@ -602,8 +604,12 @@ def get_first(prop_array):
                 return prop_array[0]
             else:
                 return None
-        legend_handle.set_edgecolor(first_color(orig_handle.get_edgecolor()))
-        legend_handle.set_facecolor(first_color(orig_handle.get_facecolor()))
+        edgecolor = getattr(orig_handle, '_original_edgecolor',
+                            orig_handle.get_edgecolor())
+        legend_handle.set_edgecolor(first_color(edgecolor))
+        facecolor = getattr(orig_handle, '_original_facecolor',
+                            orig_handle.get_facecolor())
+        legend_handle.set_facecolor(first_color(facecolor))
         legend_handle.set_fill(orig_handle.get_fill())
         legend_handle.set_hatch(orig_handle.get_hatch())
         legend_handle.set_linewidth(get_first(orig_handle.get_linewidths()))
 
@@ -200,6 +200,7 @@ def update_from(self, other):
         self._facecolor = other._facecolor
         self._fill = other._fill
         self._hatch = other._hatch
+        self._hatch_color = other._hatch_color
         # copy the unscaled dash pattern
         self._us_dashes = other._us_dashes
         self.set_linewidth(other._linewidth)  # also sets dash properties