TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 19:08:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

glgsg: fix assertion encountered when trying to use pointer textures

Browse Source 
Fixes LP 990089
This commit is contained in:
rdb 2017-03-10 23:00:00 +01:00
parent ce736ad093
commit 64a7fbab87
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
panda/src/gobj/texture.I
View File

@ -1544,7 +1544,14 @@ INLINE size_t Texture::
get_ram_mipmap_image_size(int n) const { get_ram_mipmap_image_size(int n) const {
CDReader cdata(_cycler); CDReader cdata(_cycler);
if (n >= 0 && n < (int)cdata->_ram_images.size()) { if (n >= 0 && n < (int)cdata->_ram_images.size()) {
return cdata->_ram_images[n]._image.size(); if (cdata->_ram_images[n]._pointer_image == nullptr) {
return cdata->_ram_images[n]._image.size();
} else {
// Calculate it based on the given page size.
return do_get_ram_mipmap_page_size(cdata, n) *
do_get_expected_mipmap_z_size(cdata, n) *
cdata->_num_views;
}
} }
return 0; return 0;
} }