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/z-invert-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/z-invert-material.js')
| -rw-r--r-- | js/lib/rdge/materials/z-invert-material.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/rdge/materials/z-invert-material.js b/js/lib/rdge/materials/z-invert-material.js index 051b724f..a0d20de5 100644 --- a/js/lib/rdge/materials/z-invert-material.js +++ b/js/lib/rdge/materials/z-invert-material.js | |||
| @@ -55,7 +55,7 @@ var ZInvertMaterial = function ZInvertMaterial() { | |||
| 55 | this._shader.init(); | 55 | this._shader.init(); |
| 56 | 56 | ||
| 57 | // set up the material node | 57 | // set up the material node |
| 58 | this._materialNode = createMaterialNode("zInvertMaterial"); | 58 | this._materialNode = createMaterialNode("zInvertMaterial" + "_" + world.generateUniqueNodeID()); |
| 59 | this._materialNode.setShader(this._shader); | 59 | this._materialNode.setShader(this._shader); |
| 60 | 60 | ||
| 61 | this._time = 0; | 61 | this._time = 0; |