Aug 3, 2023 · Jul 4, 2023 · Jul 4, 2023 · Jul 4, 2023 · Jul 31, 2023
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
                    if fcolors is not None:
                        colset.append(fcolors[rs][cs])

        # In cases where there areNaNsin the data (possiblyfrom masked
        # arrays), artifacts can be introduced. Here check whetherNaNs exist
        # and removethe entries if so
        if not isinstance(polys, np.ndarray) or np.isnan(polys).any():
        # In cases where there arenon-finite valuesin the data (possiblyNaNs from
        #maskedarrays), artifacts can be introduced. Here check whethersuch values
        #are presentand removethem.
        if not isinstance(polys, np.ndarray) ornotnp.isfinite(polys).all():
            new_polys = []
            new_colset = []

            # Depending on fcolors, colset is either an empty list or has as
            # many elements as polys. In the former case new_colset results in
            # a list with None entries, that is discarded later.
            for p, col in itertools.zip_longest(polys, colset):
                new_poly = np.array(p)[~np.isnan(p).any(axis=1)]
                new_poly = np.array(p)[np.isfinite(p).all(axis=1)]
                if len(new_poly):
                    new_polys.append(new_poly)
                    new_colset.append(col)
diff --git a/lib/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/surface3d_zsort_inf.png b/lib/mpl_toolkits/mplot3d/tests/baseline_images/test_axes3d/surface3d_zsort_inf.png
diff --git a/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py b/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py
    # Assert sizes' equality
    assert len(path3d.get_offsets()) ==\
           len(super(type(path3d), path3d).get_facecolors())


 @mpl3d_image_comparison(['surface3d_zsort_inf.png'], style='mpl20')
 def test_surface3d_zsort_inf():
    fig = plt.figure()
    ax = fig.add_subplot(projection='3d')

    x, y = np.mgrid[-2:2:0.1, -2:2:0.1]
    z = np.sin(x)**2 + np.cos(y)**2
    z[x.shape[0] // 2:, x.shape[1] // 2:] = np.inf

    ax.plot_surface(x, y, z, cmap='jet')
    ax.view_init(elev=45, azim=145)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1702,18 +1702,18 @@ def plot_surface(self, X, Y, Z, *, norm=None, vmin=None,
		if fcolors is not None:
		colset.append(fcolors[rs][cs])

		# In cases where there areNaNsin the data (possiblyfrom masked
		# arrays), artifacts can be introduced. Here check whetherNaNs exist
		# and removethe entries if so
		if not isinstance(polys, np.ndarray) or np.isnan(polys).any():
		# In cases where there arenon-finite valuesin the data (possiblyNaNs from
		#maskedarrays), artifacts can be introduced. Here check whethersuch values
		#are presentand removethem.
		if not isinstance(polys, np.ndarray) ornotnp.isfinite(polys).all():
		new_polys = []
		new_colset = []

		# Depending on fcolors, colset is either an empty list or has as
		# many elements as polys. In the former case new_colset results in
		# a list with None entries, that is discarded later.
		for p, col in itertools.zip_longest(polys, colset):
		new_poly = np.array(p)[~np.isnan(p).any(axis=1)]
		new_poly = np.array(p)[np.isfinite(p).all(axis=1)]
		if len(new_poly):
		new_polys.append(new_poly)
		new_colset.append(col)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2232,3 +2232,16 @@ def test_scatter_masked_color():
		# Assert sizes' equality
		assert len(path3d.get_offsets()) ==\
		len(super(type(path3d), path3d).get_facecolors())


		@mpl3d_image_comparison(['surface3d_zsort_inf.png'], style='mpl20')
		def test_surface3d_zsort_inf():
		fig = plt.figure()
		ax = fig.add_subplot(projection='3d')

		x, y = np.mgrid[-2:2:0.1, -2:2:0.1]
		z = np.sin(x)2 + np.cos(y)2
		z[x.shape[0] // 2:, x.shape[1] // 2:] = np.inf

		ax.plot_surface(x, y, z, cmap='jet')
		ax.view_init(elev=45, azim=145)