aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js
diff options
context:
space:
mode:
authorJonathan Duran2012-03-14 08:59:17 -0700
committerJonathan Duran2012-03-14 08:59:17 -0700
commite065244ac75d1d0f25fd5c75cb58e714a13fe16b (patch)
tree6b49a85a45fdd41b81be5603fbbc2e0d197eb187 /js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js
parente8f207dc50ad942ee8c1c1db6b146c0110ce3216 (diff)
downloadninja-e065244ac75d1d0f25fd5c75cb58e714a13fe16b.tar.gz
Squashed commit of the following:
merge master into timeline Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/helper-classes/backup-delete/Materials/LinearGradientMaterial.js')
-rwxr-xr-xjs/helper-classes/backup-delete/Materials/LinearGradientMaterial.js2
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