From d83fb1180aee8b046074b27ebd01aae378363a46 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Thu, 9 Feb 2012 12:19:16 -0800 Subject: Fixed bad merge in FlatMaterials. Signed-off-by: Nivesh Rajbhandari --- js/helper-classes/RDGE/Materials/FlatMaterial.js | 1 + 1 file changed, 1 insertion(+) (limited to 'js/helper-classes') diff --git a/js/helper-classes/RDGE/Materials/FlatMaterial.js b/js/helper-classes/RDGE/Materials/FlatMaterial.js index 83da145e..e2f23d75 100644 --- a/js/helper-classes/RDGE/Materials/FlatMaterial.js +++ b/js/helper-classes/RDGE/Materials/FlatMaterial.js @@ -127,6 +127,7 @@ function FlatMaterial() { } +} // used to create unique names var flatMaterialCounter = 0; -- cgit v1.2.3