Let's not just arbitrarily ignore colorizations in this image provider. It's making the artists using test tiles in the editor sad.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1013 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
Mike Thomas
2010-09-15 01:13:22 +00:00
parent d59be4e7a3
commit 178fa9db35
@@ -32,6 +32,7 @@ import com.samskivert.util.LRUHashMap;
import com.threerings.media.image.BufferedMirage;
import com.threerings.media.image.Colorization;
import com.threerings.media.image.ImageUtil;
import com.threerings.media.image.Mirage;
import static com.threerings.media.Log.log;
@@ -54,7 +55,12 @@ public abstract class SimpleCachingImageProvider implements ImageProvider
log.warning("Failed to load image [path=" + path + ", ioe=" + ioe + "].");
}
}
return image;
if (zations == null || image == null) {
return image;
} else {
return ImageUtil.recolorImage(image, zations);
}
}
// documentation inherited from interface