FIX: logic error with cmap

astromancer · astromancer · commit e70e8b2ab4dc · 2024-06-13T13:55:16.000+02:00
diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py
@@ -1234,15 +1234,17 @@ def __init__(self, x, y, z, dxy='0.8', z0=0, shade=True, lightsource=None,
         self._lightsource = lightsource
 
         COLOR_KWS = {'color', 'facecolor', 'facecolors'}
-        if not (no_cmap := (cmap is None)) and (ckw := COLOR_KWS.intersection(kws)):
-            warnings.warn(f'Ignoring cmap since {ckw!r} provided.')
-            kws.pop('cmap', None)
+        if cmap is not None:
+            if (ckw := COLOR_KWS.intersection(kws)):
+                warnings.warn(f'Ignoring cmap since {ckw!r} provided.')
+            else:
+                kws.update(cmap=cmap)
 
         # init Poly3DCollection
         #                               rectangle side panel vertices
         Poly3DCollection.__init__(self, self._compute_verts(), **kws)
 
-        if not no_cmap:
+        if cmap:
             self.set_array(self.z.ravel())
 
     def _resolve_dx_dy(self, dxy):
@@ -1445,7 +1447,7 @@ class HexBar3DCollection(Bar3DCollection):
     def _compute_verts(self):
 
         # scale the base hexagon
-        hexagon = np.array([self.dx, self.dy * np.sqrt(3)]).T * HEXAGON
+        hexagon = np.array([self.dx, self.dy / np.sqrt(3)]).T * HEXAGON
         xy_pairs = np.moveaxis([hexagon, np.roll(hexagon, -1, 0)], 0, 1)
         xy_sides = xy_pairs[np.newaxis] + self.xy[:, None, None].T  # (n,6,2,2)
 
