aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorhwc4872012-06-12 16:43:03 -0700
committerhwc4872012-06-12 16:43:03 -0700
commit6c43ac77dcfcb85b9a29ddac8547ef7eb69d3937 (patch)
tree7e3ceca9faac9e53e99671c278611cf6915899b4 /js
parent80d9f718d64cd006ca98931209e548f116965dc1 (diff)
downloadninja-6c43ac77dcfcb85b9a29ddac8547ef7eb69d3937.tar.gz
Moved Flat material to the top of the drop down.
Diffstat (limited to 'js')
-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 c3b111f4..95f152e3 100755
--- a/js/models/materials-model.js
+++ b/js/models/materials-model.js
@@ -48,11 +48,11 @@ exports.MaterialsModel = Montage.create(Component, {
48 deserializedFromTemplate: { 48 deserializedFromTemplate: {
49 value: function() { 49 value: function() {
50 // Load all the materials 50 // Load all the materials
51 this.addMaterial(new FlatMaterial());
51 this.addMaterial(new BumpMetalMaterial()); 52 this.addMaterial(new BumpMetalMaterial());
52 this.addMaterial(new CloudMaterial()); 53 this.addMaterial(new CloudMaterial());
53 this.addMaterial(new DeformMaterial()); 54 this.addMaterial(new DeformMaterial());
54 this.addMaterial(new FlagMaterial()); 55 this.addMaterial(new FlagMaterial());
55 this.addMaterial(new FlatMaterial());
56 this.addMaterial(new FlyMaterial()); 56 this.addMaterial(new FlyMaterial());
57 this.addMaterial(new JuliaMaterial()); 57 this.addMaterial(new JuliaMaterial());
58 this.addMaterial(new KeleidoscopeMaterial()); 58 this.addMaterial(new KeleidoscopeMaterial());