diff options
author | Pushkar Joshi | 2012-03-13 11:36:11 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-13 11:36:11 -0700 |
commit | 6023f7c8258e660388ee33730601f1161f9299e9 (patch) | |
tree | 632484428b398f71b8481aa8e30180895ff2483c /js/helper-classes/backup-delete/Materials/TaperMaterial.js | |
parent | 76f2021618c0a6a99a1b855233e353e84ca99467 (diff) | |
parent | 4ad1650f629e7e345eade52ed6dadc233b27cc45 (diff) | |
download | ninja-6023f7c8258e660388ee33730601f1161f9299e9.tar.gz |
Merge branch 'pentool' into brushtool
Diffstat (limited to 'js/helper-classes/backup-delete/Materials/TaperMaterial.js')
-rw-r--r-- | js/helper-classes/backup-delete/Materials/TaperMaterial.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/helper-classes/backup-delete/Materials/TaperMaterial.js b/js/helper-classes/backup-delete/Materials/TaperMaterial.js index e8cc7a49..eea3f699 100644 --- a/js/helper-classes/backup-delete/Materials/TaperMaterial.js +++ b/js/helper-classes/backup-delete/Materials/TaperMaterial.js | |||
@@ -42,7 +42,7 @@ function TaperMaterial() | |||
42 | // duplcate method requirde | 42 | // duplcate method requirde |
43 | this.dup = function() { return new TaperMaterial(); } | 43 | this.dup = function() { return new TaperMaterial(); } |
44 | 44 | ||
45 | this.init = function() | 45 | this.init = function( world ) |
46 | { | 46 | { |
47 | // set up the shader | 47 | // set up the shader |
48 | this._shader = new jshader(); | 48 | this._shader = new jshader(); |
@@ -53,7 +53,7 @@ function TaperMaterial() | |||
53 | this._shader.colorMe.color.set( this.getColor() ); | 53 | this._shader.colorMe.color.set( this.getColor() ); |
54 | 54 | ||
55 | // set up the material node | 55 | // set up the material node |
56 | this._materialNode = createMaterialNode("taperMaterial"); | 56 | this._materialNode = createMaterialNode("taperMaterial_" + world.generateUniqueNodeID()); |
57 | this._materialNode.setShader(this._shader); | 57 | this._materialNode.setShader(this._shader); |
58 | 58 | ||
59 | // initialize the taper properties | 59 | // initialize the taper properties |