Merge branch 'master' into rendermode-options

2011-08-04 19:30:52 -04:00
parent 4ecb370b9c c56f1d23c9
commit c3a323570d
6 changed files with 107 additions and 63 deletions
--- a/overviewer_core/src/overviewer.h
+++ b/overviewer_core/src/overviewer.h
@@ -76,6 +76,8 @@ typedef struct {
    /* the block position and type, and the block array */
    int x, y, z;
    unsigned char block;
+    unsigned char block_data;
+    unsigned char block_pdata;
    PyObject *blockdata_expanded;
    PyObject *blocks;
    PyObject *up_left_blocks;