Merge branch 'master' into maddin/shader-weapclip

diff --git a/scripts/common.shader b/scripts/common.shader
index 68c77762722e56f4fe2b34e46b739aa352309cdb..0d44bb3d9f7e980d3d0c1e4ec04eacc147ca5332 100644 (file)
--- a/scripts/common.shader
+++ b/scripts/common.shader
@@ -196,7 +196,6 @@ textures/common/weapclip
     surfaceparm nodraw
     surfaceparm nolightmap
     surfaceparm trans
-    surfaceparm nomarks
 }
 
 //