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

… changed it. Fixes #2487.
Warzone2100 · Feb 13, 2011 · 84740c4 · 84740c4
1 parent e862a99
commit 84740c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/display3d.cpp b/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);
 }
 

diff --git a/src/terrain.cpp b/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();