LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

removed historical, seperate mask from texture tuples (Issue #516)

Browse Source
This commit is contained in:
Aaron Griffith
2011-10-31 13:40:38 -04:00
parent 69c109fc05
commit 75858f2df8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
overviewer_core/src/iterate.c
View File

@@ -450,8 +450,8 @@ chunk_render(PyObject *self, PyObject *args) {
PyObject *src, *mask, *mask_light; PyObject *src, *mask, *mask_light;
int randx = 0, randy = 0; int randx = 0, randy = 0;
src = PyTuple_GetItem(t, 0); src = PyTuple_GetItem(t, 0);
mask = PyTuple_GetItem(t, 1); mask = PyTuple_GetItem(t, 0);
mask_light = PyTuple_GetItem(t, 2); mask_light = PyTuple_GetItem(t, 1);
if (mask == Py_None) if (mask == Py_None)
mask = src; mask = src;

2
overviewer_core/textures.py
View File

@@ -517,7 +517,7 @@ def generate_opaque_mask(img):
def generate_texture_tuple(img, blockid): def generate_texture_tuple(img, blockid):
""" This takes an image and returns the needed tuple for the """ This takes an image and returns the needed tuple for the
blockmap list and specialblockmap dictionary.""" 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): def generate_special_texture(blockID, data):
"""Generates a special texture, such as a correctly facing minecraft track""" """Generates a special texture, such as a correctly facing minecraft track"""