aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/MaterialsLibrary.js
diff options
context:
space:
mode:
authorEric Guzman2012-02-08 14:41:56 -0800
committerEric Guzman2012-02-08 14:41:56 -0800
commit637db74743ac1397ade7edec3da3ae1c1cdaa82a (patch)
treebc16578a5368098956d39f16ddd48737a9bb355c /js/helper-classes/RDGE/MaterialsLibrary.js
parent40622aa97d31837254996b718b0a6feca2bcd0ce (diff)
parentab12be4e9a0d9fee4450795077b0107983b5682e (diff)
downloadninja-637db74743ac1397ade7edec3da3ae1c1cdaa82a.tar.gz
Merge branch 'refs/heads/master' into StylesControllerUpdates
Diffstat (limited to 'js/helper-classes/RDGE/MaterialsLibrary.js')
-rw-r--r--js/helper-classes/RDGE/MaterialsLibrary.js2
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
172var flatMaterial = new FlatMaterial();
172var uberMaterial = new UberMaterial(); 173var 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();
183var bumpMetalMaterial = new BumpMetalMaterial(); 184var bumpMetalMaterial = new BumpMetalMaterial();
184 185
186MaterialsLibrary.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);