summaryrefslogtreecommitdiff
path: root/src/engine/decal.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine/decal.cpp')
-rw-r--r--src/engine/decal.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/engine/decal.cpp b/src/engine/decal.cpp
index ccee329..27020d7 100644
--- a/src/engine/decal.cpp
+++ b/src/engine/decal.cpp
@@ -251,12 +251,11 @@ struct decalrenderer
}
else
{
- if(flags&DF_INVMOD) { glBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_COLOR); zerofogcolor(); }
- else if(flags&DF_ADD) { glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR); zerofogcolor(); }
+ if(flags&DF_INVMOD) { glBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_COLOR); }
+ else if(flags&DF_ADD) { glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_COLOR); }
else glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
if(flags&DF_SATURATE) SETSHADER(saturatedecal);
- else foggedshader->set();
}
glBindTexture(GL_TEXTURE_2D, tex->id);
@@ -286,8 +285,6 @@ struct decalrenderer
glDrawArrays(GL_TRIANGLES, 0, count);
xtravertsva += count;
- if(flags&(DF_ADD|DF_INVMOD)) resetfogcolor();
-
extern int intel_vertexarray_bug;
if(intel_vertexarray_bug) glFlush();
}
@@ -503,7 +500,7 @@ struct decalrenderer
loopi(matsurfs)
{
materialsurface &m = matbuf[i];
- if(!isclipped(m.material&MATF_VOLUME)) { i += m.skip; continue; }
+ if(1) { i += m.skip; continue; }
int dim = dimension(m.orient), dc = dimcoord(m.orient);
if(dc ? decalnormal[dim] <= 0 : decalnormal[dim] >= 0) { i += m.skip; continue; }
int c = C[dim], r = R[dim];