From 75858f2df80fae3022fd48de73f7e23f7f2e6016 Mon Sep 17 00:00:00 2001 From: Aaron Griffith Date: Mon, 31 Oct 2011 13:40:38 -0400 Subject: [PATCH] removed historical, seperate mask from texture tuples (Issue #516) --- overviewer_core/src/iterate.c | 4 ++-- overviewer_core/textures.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/overviewer_core/src/iterate.c b/overviewer_core/src/iterate.c index 618c3aa..d0ab6a2 100644 --- a/overviewer_core/src/iterate.c +++ b/overviewer_core/src/iterate.c @@ -450,8 +450,8 @@ chunk_render(PyObject *self, PyObject *args) { PyObject *src, *mask, *mask_light; int randx = 0, randy = 0; src = PyTuple_GetItem(t, 0); - mask = PyTuple_GetItem(t, 1); - mask_light = PyTuple_GetItem(t, 2); + mask = PyTuple_GetItem(t, 0); + mask_light = PyTuple_GetItem(t, 1); if (mask == Py_None) mask = src; diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index f4416db..73cb5da 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -517,7 +517,7 @@ def generate_opaque_mask(img): def generate_texture_tuple(img, blockid): """ This takes an image and returns the needed tuple for the blockmap list and specialblockmap dictionary.""" - return (img.convert("RGB"), img.split()[3], generate_opaque_mask(img)) + return (img, generate_opaque_mask(img)) def generate_special_texture(blockID, data): """Generates a special texture, such as a correctly facing minecraft track"""