diff options
| author | Nivesh Rajbhandari | 2012-02-09 12:19:16 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-02-09 12:19:16 -0800 |
| commit | d83fb1180aee8b046074b27ebd01aae378363a46 (patch) | |
| tree | 2ef9e99cee3e90bf93f764ce5f49bdfce4e861f7 /js/helper-classes | |
| parent | a9b1a1f2642841c4165ede69d131b1deb6238622 (diff) | |
| download | ninja-d83fb1180aee8b046074b27ebd01aae378363a46.tar.gz | |
Fixed bad merge in FlatMaterials.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/helper-classes')
| -rw-r--r-- | js/helper-classes/RDGE/Materials/FlatMaterial.js | 1 |
1 files changed, 1 insertions, 0 deletions
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() | |||
| 127 | { | 127 | { |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | } | ||
| 130 | // used to create unique names | 131 | // used to create unique names |
| 131 | var flatMaterialCounter = 0; | 132 | var flatMaterialCounter = 0; |
| 132 | 133 | ||