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

don't assertion fail

Browse Source
This commit is contained in:
David Rose 2002-08-14 13:59:38 +00:00
parent 763195a6aa
commit 55a83870ee
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandatool/src/egg-palettize/textureImage.cxx
View File

@ -833,7 +833,7 @@ write_scale_info(ostream &out, int indent_level) {
<< " " << source->get_num_channels(); << " " << source->get_num_channels();
} }
if (!_placement.empty()) { if (!_placement.empty() && is_size_known()) {
out << " new " << get_x_size() << " " << get_y_size() out << " new " << get_x_size() << " " << get_y_size()
<< " " << get_num_channels(); << " " << get_num_channels();
@ -864,8 +864,9 @@ write_scale_info(ostream &out, int indent_level) {
indent(out, indent_level + 2) indent(out, indent_level + 2)
<< "copied to " << "copied to "
<< FilenameUnifier::make_user_filename(image->get_filename()); << FilenameUnifier::make_user_filename(image->get_filename());
if (image->get_x_size() != get_x_size() || if (image->is_size_known() && is_size_known() &&
image->get_y_size() != get_y_size()) { (image->get_x_size() != get_x_size() ||
image->get_y_size() != get_y_size())) {
out << " at size " << image->get_x_size() << " " out << " at size " << image->get_x_size() << " "
<< image->get_y_size(); << image->get_y_size();
if (source != (SourceTextureImage *)NULL && if (source != (SourceTextureImage *)NULL &&