TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.9.x'

Browse Source
This commit is contained in:
rdb 2016-02-22 19:48:21 +01:00
commit 656ccfcafb
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
panda/src/gobj/texture.cxx
View File

@ -6232,7 +6232,10 @@ do_set_simple_ram_image(CData *cdata, CPTA_uchar image, int x_size, int y_size)
*/ */
int Texture:: int Texture::
do_get_expected_num_mipmap_levels(const CData *cdata) const { 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; int count = 1;
while (size > 1) { while (size > 1) {
size >>= 1; size >>= 1;