diff options
author | Eric Guzman | 2012-02-08 15:33:30 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-08 15:33:30 -0800 |
commit | 4ab650bccc776b031191dc410a93309a9d342bab (patch) | |
tree | 55a2c7cdda8cce2ede9a8efcb3e77bfa96abc821 /js/helper-classes/RDGE/MaterialsLibrary.js | |
parent | 7fc8ce44579b0464710d0696782daf7df776b1a0 (diff) | |
parent | 0537f8f29e7b8dd48fd08f20b1533fbe92a54c4b (diff) | |
download | ninja-4ab650bccc776b031191dc410a93309a9d342bab.tar.gz |
Merge branch 'refs/heads/master' into PresetsPanel
Diffstat (limited to 'js/helper-classes/RDGE/MaterialsLibrary.js')
-rw-r--r-- | js/helper-classes/RDGE/MaterialsLibrary.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/helper-classes/RDGE/MaterialsLibrary.js b/js/helper-classes/RDGE/MaterialsLibrary.js index edc4f7da..9616b525 100644 --- a/js/helper-classes/RDGE/MaterialsLibrary.js +++ b/js/helper-classes/RDGE/MaterialsLibrary.js | |||
@@ -169,6 +169,7 @@ var MaterialsLibrary = Object.create(Object.prototype, { | |||
169 | 169 | ||
170 | // create the library of stroke and fill materials | 170 | // create the library of stroke and fill materials |
171 | 171 | ||
172 | var flatMaterial = new FlatMaterial(); | ||
172 | var uberMaterial = new UberMaterial(); | 173 | var uberMaterial = new UberMaterial(); |
173 | //var linearGradientMaterial = new LinearGradientMaterial(); | 174 | //var linearGradientMaterial = new LinearGradientMaterial(); |
174 | //var radialGradientMaterial = new RadialGradientMaterial(); | 175 | //var radialGradientMaterial = new RadialGradientMaterial(); |
@@ -182,6 +183,7 @@ var uberMaterial = new UberMaterial(); | |||
182 | //var plasmaMaterial = new PlasmaMaterial(); | 183 | //var plasmaMaterial = new PlasmaMaterial(); |
183 | var bumpMetalMaterial = new BumpMetalMaterial(); | 184 | var bumpMetalMaterial = new BumpMetalMaterial(); |
184 | 185 | ||
186 | MaterialsLibrary.addMaterial(flatMaterial); | ||
185 | //MaterialsLibrary.addMaterial(linearGradientMaterial); | 187 | //MaterialsLibrary.addMaterial(linearGradientMaterial); |
186 | //MaterialsLibrary.addMaterial(radialGradientMaterial); | 188 | //MaterialsLibrary.addMaterial(radialGradientMaterial); |
187 | //MaterialsLibrary.addMaterial(radialBlurMaterial); | 189 | //MaterialsLibrary.addMaterial(radialBlurMaterial); |