Fix some merge conflicts.

2013-06-17 12:29:47 +02:00
parent ca22872dae
commit c505260ec1
2 changed files with 2 additions and 2 deletions
@@ -251,7 +251,7 @@ static void GenerateLightingShader(T& object, LightingUidData& uid_data, int com
 					GenerateLightShader<T>(object, uid_data, i, lit_index, lightsName, coloralpha);
 			}
 		}
-		object.Write("%s%d = mat * saturate(lacc);\n", dest, j);
+		object.Write("%s%d = mat * clamp(lacc, 0.0, 1.0);\n", dest, j);
 		object.Write("}\n");
 	}
 }