Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Reset color to white before rendering decals rather than after having…

… changed it.

Fixes #2487.
  • Loading branch information...
commit 84740c43901d062dbd947e2d5e80be53a60f6b49 1 parent e862a99
@Safety0ff Safety0ff authored
Showing with 4 additions and 1 deletion.
  1. +0 −1  src/display3d.cpp
  2. +4 −0 src/terrain.cpp
View
1  src/display3d.cpp
@@ -3374,7 +3374,6 @@ static void drawDroidSelections( void )
}
}
- glColor3f( 1.f, 1.f, 1.f); // Reset colors
pie_SetDepthBufferStatus(DEPTH_CMP_LEQ_WRT_ON);
}
View
4 src/terrain.cpp
@@ -1335,8 +1335,12 @@ void drawTerrain(void)
// select the terrain texture page
pie_SetTexturePage(terrainPage); glError();
+
// use the alpha to blend
pie_SetRendMode(REND_ALPHA);
+ // don't blend decals with another color
+ glColor3f( 1.f, 1.f, 1.f);
+
// and the texture coordinates buffer
glEnableClientState(GL_TEXTURE_COORD_ARRAY); glError();
glEnableClientState(GL_VERTEX_ARRAY); glError();
Please sign in to comment.
Something went wrong with that request. Please try again.