diff options
Diffstat (limited to 'src/engine/material.cpp')
| -rw-r--r-- | src/engine/material.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/engine/material.cpp b/src/engine/material.cpp index 6fee9d3..b8a3f7f 100644 --- a/src/engine/material.cpp +++ b/src/engine/material.cpp @@ -125,7 +125,7 @@ const char *findmaterialname(int mat) const char *getmaterialdesc(int mat, const char *prefix) { - static const ushort matmasks[] = { MATF_VOLUME|MATF_INDEX, MATF_CLIP, MAT_DEATH, MAT_ALPHA }; + static const ushort matmasks[] = { MATF_INDEX, MATF_CLIP, MAT_DEATH, MAT_ALPHA }; static string desc; desc[0] = '\0'; loopi(sizeof(matmasks)/sizeof(matmasks[0])) if(mat&matmasks[i]) @@ -160,7 +160,7 @@ void genmatsurfs(const cube &c, const ivec &co, int size, vector<materialsurface { loopi(6) { - static const ushort matmasks[] = { MATF_VOLUME|MATF_INDEX, MATF_CLIP, MAT_DEATH, MAT_ALPHA }; + static const ushort matmasks[] = { MATF_INDEX, MATF_CLIP, MAT_DEATH, MAT_ALPHA }; loopj(sizeof(matmasks)/sizeof(matmasks[0])) { int matmask = matmasks[j]; @@ -302,7 +302,7 @@ void setupmaterials(int start, int len) loopj(va->matsurfs) { materialsurface &m = va->matbuf[j]; - int matvol = m.material&MATF_VOLUME; + int matvol = 0; if(matvol) hasmat |= 1<<m.material; m.skip = 0; if(skip && m.material == skip->material && m.orient == skip->orient && skip->skip < 0xFFFF) @@ -366,10 +366,9 @@ void sortmaterials(vector<materialsurface *> &vismats) materialsurface &m = va->matbuf[i]; if(!editmode || !showmat || drawtex) { - int matvol = m.material&MATF_VOLUME; + int matvol = 0; if(m.visible == MATSURF_EDIT_ONLY) { i += m.skip; continue; } } - else if(glaring) continue; vismats.add(&m); } } @@ -417,7 +416,6 @@ void rendermaterials() MSlot *mslot = NULL; int lastorient = -1, lastmat = -1; bool depth = true, blended = false; - ushort envmapped = EMID_NONE; GLOBALPARAM(camera, camera1->o); |