MNT: factor updating the 3D colors out into private helper

tacaswell · tacaswell · commit 3c8a92f82d76 · 2020-11-10T17:08:46.000-05:00
diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py
@@ -301,6 +301,7 @@ def do_3d_projection(self, renderer=None):
         """
         Project the points according to renderer matrix.
         """
+        _update_scalarmappable(self)
         xyslist = [proj3d.proj_trans_points(points, self.axes.M)
                    for points in self._segments3d]
         segments_2d = [np.column_stack([xs, ys]) for xs, ys, zs in xyslist]
@@ -486,6 +487,7 @@ def set_3d_properties(self, zs, zdir):
 
     @cbook._delete_parameter('3.4', 'renderer')
     def do_3d_projection(self, renderer=None):
+        _update_scalarmappable(self)
         xs, ys, zs = self._offsets3d
         vxs, vys, vzs, vis = proj3d.proj_transform_clip(xs, ys, zs,
                                                         self.axes.M)
@@ -592,7 +594,7 @@ def set_linewidth(self, lw):
 
     @cbook._delete_parameter('3.4', 'renderer')
     def do_3d_projection(self, renderer=None):
-        self.update_scalarmappable()
+        _update_scalarmappable(self)
         xs, ys, zs = self._offsets3d
         vxs, vys, vzs, vis = proj3d.proj_transform_clip(xs, ys, zs,
                                                         self.axes.M)
@@ -635,15 +637,15 @@ def do_3d_projection(self, renderer=None):
 
         return np.min(vzs) if vzs.size else np.nan
 
-    def update_scalarmappable(self):
-        copy_state = self._update_dict['array']
-        ret = super().update_scalarmappable()
-        if copy_state:
-            if self._is_filled:
-                self._facecolor3d = self._facecolors
-            elif self._is_stroked:
-                self._edgecolor3d = self._edgecolors
-        return ret
+
+def _update_scalarmappable(sm):
+    copy_state = sm._update_dict['array']
+    ret = sm.update_scalarmappable()
+    if copy_state:
+        if sm._is_filled:
+            sm._facecolor3d = sm._facecolors
+        elif sm._is_stroked:
+            sm._edgecolor3d = sm._edgecolors
 
 
 def patch_collection_2d_to_3d(col, zs=0, zdir='z', depthshade=True):
@@ -783,10 +785,7 @@ def do_3d_projection(self, renderer=None):
         """
         Perform the 3D projection for this object.
         """
-        # FIXME: This may no longer be needed?
-        if self._A is not None:
-            self.update_scalarmappable()
-            self._facecolors3d = self._facecolors
+        _update_scalarmappable(self)
 
         txs, tys, tzs = proj3d._proj_transform_vec(self._vec, self.axes.M)
         xyzlist = [(txs[sl], tys[sl], tzs[sl]) for sl in self._segslices]
