From 844a284925a97a111f010a53c1c2ff6627689cea Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 22 Feb 2016 19:47:08 +0100 Subject: [PATCH] Fix mipmap level count calculation for texture arrays --- panda/src/gobj/texture.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/panda/src/gobj/texture.cxx b/panda/src/gobj/texture.cxx index 539195dcfd..e61f272d86 100644 --- a/panda/src/gobj/texture.cxx +++ b/panda/src/gobj/texture.cxx @@ -5672,7 +5672,10 @@ do_set_simple_ram_image(CData *cdata, CPTA_uchar image, int x_size, int y_size) //////////////////////////////////////////////////////////////////// int Texture:: do_get_expected_num_mipmap_levels(const CData *cdata) const { - int size = max(cdata->_x_size, max(cdata->_y_size, cdata->_z_size)); + int size = max(cdata->_x_size, cdata->_y_size); + if (cdata->_texture_type == Texture::TT_3d_texture) { + size = max(size, cdata->_z_size); + } int count = 1; while (size > 1) { size >>= 1;