From 55a83870ee3886b9fe642d1fe470e7eb151f6c4a Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 14 Aug 2002 13:59:38 +0000 Subject: [PATCH] don't assertion fail --- pandatool/src/egg-palettize/textureImage.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pandatool/src/egg-palettize/textureImage.cxx b/pandatool/src/egg-palettize/textureImage.cxx index 4f3ba3d10b..3769d905ff 100644 --- a/pandatool/src/egg-palettize/textureImage.cxx +++ b/pandatool/src/egg-palettize/textureImage.cxx @@ -833,7 +833,7 @@ write_scale_info(ostream &out, int indent_level) { << " " << source->get_num_channels(); } - if (!_placement.empty()) { + if (!_placement.empty() && is_size_known()) { out << " new " << get_x_size() << " " << get_y_size() << " " << get_num_channels(); @@ -864,8 +864,9 @@ write_scale_info(ostream &out, int indent_level) { indent(out, indent_level + 2) << "copied to " << FilenameUnifier::make_user_filename(image->get_filename()); - if (image->get_x_size() != get_x_size() || - image->get_y_size() != get_y_size()) { + if (image->is_size_known() && is_size_known() && + (image->get_x_size() != get_x_size() || + image->get_y_size() != get_y_size())) { out << " at size " << image->get_x_size() << " " << image->get_y_size(); if (source != (SourceTextureImage *)NULL &&