From 3af69258060defd65409265c2fa85a9b33fe4c90 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Wed, 30 May 2001 17:00:23 +0000
Subject: [PATCH] more of the same

---
 pandatool/src/egg-palettize/paletteImage.cxx | 9 ++++++++-
 pandatool/src/egg-palettize/palettePage.cxx  | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pandatool/src/egg-palettize/paletteImage.cxx b/pandatool/src/egg-palettize/paletteImage.cxx
index a590549ab2..833c6cdc59 100644
--- a/pandatool/src/egg-palettize/paletteImage.cxx
+++ b/pandatool/src/egg-palettize/paletteImage.cxx
@@ -294,6 +294,7 @@ count_coverage() const {
 bool PaletteImage::
 place(TexturePlacement *placement) {
   nassertr(placement->is_size_known(), true);
+  nassertr(!placement->is_placed(), true);
 
   int x, y;
   if (find_hole(x, y, placement->get_x_size(), placement->get_y_size())) {
@@ -316,8 +317,9 @@ unplace(TexturePlacement *placement) {
 
   Placements::iterator pi;
   pi = find(_placements.begin(), _placements.end(), placement);
-  if (pi != _placements.end()) {
+  while (pi != _placements.end()) {
     _placements.erase(pi);
+    pi = find(_placements.begin(), _placements.end(), placement);
   }
 
   _cleared_regions.push_back(ClearedRegion(placement));
@@ -356,6 +358,11 @@ check_solitary() {
     Placements::const_iterator pi;
     for (pi = _placements.begin(); pi != _placements.end(); ++pi) {
       TexturePlacement *placement = (*pi);
+      if (!(placement->get_omit_reason() == OR_none ||
+            placement->get_omit_reason() == OR_solitary)) {
+        cerr << "texture " << *placement->get_texture() << " is omitted for "
+             << placement->get_omit_reason() << "\n";
+      }
       nassertv(placement->get_omit_reason() == OR_none ||
                placement->get_omit_reason() == OR_solitary);
       placement->not_solitary();
diff --git a/pandatool/src/egg-palettize/palettePage.cxx b/pandatool/src/egg-palettize/palettePage.cxx
index 38089e1348..7b919a00a2 100644
--- a/pandatool/src/egg-palettize/palettePage.cxx
+++ b/pandatool/src/egg-palettize/palettePage.cxx
@@ -105,6 +105,7 @@ place_all() {
   Assigned::const_iterator ai;
   for (ai = _assigned.begin(); ai != _assigned.end(); ++ai) {
     TexturePlacement *placement = (*ai);
+    cerr << "Placing " << *placement->get_texture() << "\n";
     place(placement);
   }