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

prevent crash when reloading textures

Browse Source
This commit is contained in:
David Rose 2005-07-27 22:38:51 +00:00
parent af3ef86096
commit 756340d3e9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -597,6 +597,7 @@ load(const PNMImage &pnmimage, int z) {
} else { } else {
if (_x_size != pnmimage.get_x_size() || if (_x_size != pnmimage.get_x_size() ||
_y_size != pnmimage.get_y_size() || _y_size != pnmimage.get_y_size() ||
_num_components != num_components ||
_component_type != component_type) { _component_type != component_type) {
gobj_cat.error() gobj_cat.error()
<< "Texture properties have changed for texture " << get_name() << "Texture properties have changed for texture " << get_name()
@ -922,9 +923,10 @@ get_ram_image() {
make_ram_image(); make_ram_image();
if (has_alpha_fullpath()) { if (has_alpha_fullpath()) {
read(get_fullpath(), get_alpha_fullpath()); read(get_fullpath(), get_alpha_fullpath(),
0, _primary_file_num_channels, _alpha_file_channel);
} else { } else {
read(get_fullpath()); read(get_fullpath(), 0, _primary_file_num_channels);
} }
} }