Merge pull request #996 from qw-ctf/minor-cleanups

QW-Group · Jan 13, 2025 · fb445b3 · fb445b3
2 parents f39eb14 + 3c50998
commit fb445b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/r_brushmodel_surfaces.c b/src/r_brushmodel_surfaces.c
@@ -136,7 +136,9 @@ void R_BrushModelClearTextureChains(model_t *clmodel)
 	texture_t *texture;
 
 #ifdef RENDERER_OPTION_CLASSIC_OPENGL
-	GLC_ClearTextureChains();
+	if (R_UseImmediateOpenGL()) {
+		GLC_ClearTextureChains();
+	}
 #endif
 
 	clmodel->texturechains_have_lumas = false;

diff --git a/src/r_rmain.c b/src/r_rmain.c
@@ -888,10 +888,6 @@ void R_RenderView(void)
 	// render normal view
 	R_DrawWorld();		// adds static entities to the list
 
-	if (r_refdef2.wateralpha == 1) {
-		renderer.DrawWaterSurfaces();
-	}
-
 	R_DrawEntities();
 
 	// Adds 3d effects (particles, lights, chat icons etc)