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/LinearGradientMaterial.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/LinearGradientMaterial.js')
| -rwxr-xr-x | js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js b/js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js index 7fe2be0c..2f900894 100755 --- a/js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js +++ b/js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js | |||
| @@ -159,7 +159,7 @@ function LinearGradientMaterial() | |||
| 159 | this._shader.init(); | 159 | this._shader.init(); |
| 160 | 160 | ||
| 161 | // set up the material node | 161 | // set up the material node |
| 162 | this._materialNode = createMaterialNode( this.getShaderName() ); | 162 | this._materialNode = createMaterialNode( this.getShaderName() + world.generateUniqueNodeID() ); |
| 163 | this._materialNode.setShader(this._shader); | 163 | this._materialNode.setShader(this._shader); |
| 164 | 164 | ||
| 165 | // send the current values to the shader | 165 | // send the current values to the shader |