Fix more merge conflicts

rth · rth · commit 946b9bc6e735 · 2018-12-17T19:18:47.000+01:00
diff --git a/lib/mpl_toolkits/mplot3d/art3d.py b/lib/mpl_toolkits/mplot3d/art3d.py
@@ -674,12 +674,9 @@ def do_3d_projection(self, renderer):
             else:
                 cedge = cedge.repeat(len(xyzlist), axis=0)
 
-        # if required sort by depth (furthest drawn first)
-        if self._zsort:
-            z_argsort = np.argsort(
-                [self._zsortfunc(xyz[:, 2]) for xyz in xyzlist])[::-1]
-        else:
-            raise ValueError("whoops")
+        # sort by depth (furthest drawn first)
+        z_argsort = np.argsort(
+            [self._zsortfunc(xyz[:, 2]) for xyz in xyzlist])[::-1]
 
         segments_2d = [xyzlist[i][:, 0:2] for i in z_argsort]
         if self._codes3d is not None:
