aboutsummaryrefslogtreecommitdiff
path: root/js/models
diff options
context:
space:
mode:
authorhwc4872012-06-14 13:55:32 -0700
committerhwc4872012-06-14 13:55:32 -0700
commitbcb0266bb6f9a578d033ad5b7b9869074e4f98a1 (patch)
treeb66210f852aa924f890f9c2b2925a6a36553ff5b /js/models
parentbcd7ce86e2fb71ebc1420ea5967770ce70d9faa2 (diff)
downloadninja-bcb0266bb6f9a578d033ad5b7b9869074e4f98a1.tar.gz
Fixed alphabetization of material names.
Removed console output. Removed texture map field from Mandel material editor.
Diffstat (limited to 'js/models')
-rwxr-xr-xjs/models/materials-model.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/models/materials-model.js b/js/models/materials-model.js
index 0f214356..f18f086e 100755
--- a/js/models/materials-model.js
+++ b/js/models/materials-model.js
@@ -71,9 +71,9 @@ exports.MaterialsModel = Montage.create(Component, {
71 this.addMaterial(new TunnelMaterial()); 71 this.addMaterial(new TunnelMaterial());
72 this.addMaterial(new TwistMaterial()); 72 this.addMaterial(new TwistMaterial());
73 this.addMaterial(new TwistVertMaterial()); 73 this.addMaterial(new TwistVertMaterial());
74 this.addMaterial(new UberMaterial());
74 this.addMaterial(new WaterMaterial()); 75 this.addMaterial(new WaterMaterial());
75 this.addMaterial(new ZInvertMaterial()); 76 this.addMaterial(new ZInvertMaterial());
76 this.addMaterial(new UberMaterial());
77 } 77 }
78 }, 78 },
79 79