diff options
author | Pushkar Joshi | 2012-03-13 11:24:35 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-13 11:24:35 -0700 |
commit | 4ad1650f629e7e345eade52ed6dadc233b27cc45 (patch) | |
tree | 0e7b925f4dedf27f2684915e7e247e79c4a74aff /js/helper-classes/backup-delete/Materials/ZInvertMaterial.js | |
parent | 730c42e005b1ebd96448e3bc2dd700ffd8909cb5 (diff) | |
parent | 9f3307810541ca6f95d7ca6d1febe8afdcd2c101 (diff) | |
download | ninja-4ad1650f629e7e345eade52ed6dadc233b27cc45.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/helper-classes/backup-delete/Materials/ZInvertMaterial.js')
-rw-r--r-- | js/helper-classes/backup-delete/Materials/ZInvertMaterial.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/backup-delete/Materials/ZInvertMaterial.js b/js/helper-classes/backup-delete/Materials/ZInvertMaterial.js index 2ac8920f..c25290e3 100644 --- a/js/helper-classes/backup-delete/Materials/ZInvertMaterial.js +++ b/js/helper-classes/backup-delete/Materials/ZInvertMaterial.js | |||
@@ -71,7 +71,7 @@ function ZInvertMaterial() | |||
71 | this._shader.init(); | 71 | this._shader.init(); |
72 | 72 | ||
73 | // set up the material node | 73 | // set up the material node |
74 | this._materialNode = createMaterialNode("zInvertMaterial"); | 74 | this._materialNode = createMaterialNode("zInvertMaterial_" + world.generateUniqueNodeID()); |
75 | this._materialNode.setShader(this._shader); | 75 | this._materialNode.setShader(this._shader); |
76 | 76 | ||
77 | this._time = 0; | 77 | this._time = 0; |