diff options
| author | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
| commit | 85f21e020ac281e8e545df1cf269034de99a00b1 (patch) | |
| tree | 441834fa8b02b1cc2a970210020d27e06d2c99be /js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js | |
| parent | d9813946dc28d8c28033a68b68300b9d9eda115c (diff) | |
| parent | 11a6f18e274d7232cdbb8f6e9e65e0a5ab756451 (diff) | |
| download | ninja-85f21e020ac281e8e545df1cf269034de99a00b1.tar.gz | |
Merge pull request #29 from ericmueller/integration
Integration
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 |