diff options
| author | Eric Guzman | 2012-03-13 13:12:43 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-13 13:12:43 -0700 |
| commit | 61fd46cad105f0a52afa028e5301b96120f00ab4 (patch) | |
| tree | d8a7e23e1ea7d9b5c64a288822b7797bb19e50d4 /js/lib/rdge/materials/linear-gradient-material.js | |
| parent | 7e3161153b87b891875ac65368a19aed12909fa3 (diff) | |
| parent | f56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff) | |
| download | ninja-61fd46cad105f0a52afa028e5301b96120f00ab4.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/lib/rdge/materials/linear-gradient-material.js')
| -rwxr-xr-x | js/lib/rdge/materials/linear-gradient-material.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js index 2c52c67d..8e05e23d 100755 --- a/js/lib/rdge/materials/linear-gradient-material.js +++ b/js/lib/rdge/materials/linear-gradient-material.js | |||
| @@ -212,7 +212,7 @@ var LinearGradientMaterial = function LinearGradientMaterial() { | |||
| 212 | this._shader.init(); | 212 | this._shader.init(); |
| 213 | 213 | ||
| 214 | // set up the material node | 214 | // set up the material node |
| 215 | this._materialNode = createMaterialNode( this.getShaderName() ); | 215 | this._materialNode = createMaterialNode( this.getShaderName() + "_" + world.generateUniqueNodeID() ); |
| 216 | this._materialNode.setShader(this._shader); | 216 | this._materialNode.setShader(this._shader); |
| 217 | 217 | ||
| 218 | // send the current values to the shader | 218 | // send the current values to the shader |