--- deliantra/Deliantra-Client/DC/Texture.pm	2007/07/19 20:12:06	1.17
+++ deliantra/Deliantra-Client/DC/Texture.pm	2007/07/19 22:38:53	1.20
@@ -116,7 +116,6 @@
    }
 
    my ($tw, $th) = ($dw, $dh);
-   my ($rw, $rh) = ($dw, $dh);
 
    defined $data or $self->{render_cb} or die; # some sanity check
 
@@ -141,16 +140,22 @@
       $th >>= 1;
    }
 
+   # decide the amount of space used in the texture
+   my ($rw, $rh);
+   my $render;
+
    if ($self->{render_cb}) {
       # use only part of the texture
       #$rw >>= 1 while $rw > $tw;
       #$rh >>= 1 while $rh > $th;
-      $rw = min $rw, $tw;
-      $rh = min $rh, $th;
+      $rw = min $dw, $tw;
+      $rh = min $dh, $th;
+      ++$render;
    } else {
       if ($self->{wrap} || $tw < $dw || $th < $dh) {
          # scale to the full texture size
          ($rw, $rh) = ($tw, $th);
+         ++$render;
       } else {
          # pad
          pad $data, $dw, $dh, $tw, $th;
@@ -159,12 +164,8 @@
       }
    }
 
-   # rendering means we need to scale in some way
-   my $render = $self->{render_cb} || $rw != $dw || $th != $dh;
-
    if ($render) {
       glViewport 0, 0, $tw, $th;
-      glClear 0, 0, 0, 0;
       glMatrixMode GL_PROJECTION;
       glLoadIdentity;
       glOrtho 0, $tw, 0, $th, -10000, 10000;
@@ -175,6 +176,8 @@
          glScale $rw / $dw, $rh / $dh;
          $self->{render_cb}->($self, $rw, $rh);
       } else {
+         glClearColor 0, 0, 0, 0;
+         glClear GL_COLOR_BUFFER_BIT;
          glPixelZoom $tw / $dw, $th / $dh;
          glDrawPixels $dw, $dh,
                       $self->{format},