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/RadialBlurMaterial.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/RadialBlurMaterial.js')
-rw-r--r-- | js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js b/js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js index a5fb134c..471ff3c3 100644 --- a/js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js +++ b/js/helper-classes/backup-delete/Materials/RadialBlurMaterial.js | |||
@@ -103,7 +103,7 @@ function RadialBlurMaterial() | |||
103 | this._shader.init(); | 103 | this._shader.init(); |
104 | 104 | ||
105 | // set up the material node | 105 | // set up the material node |
106 | this._materialNode = createMaterialNode("radialBlurMaterial"); | 106 | this._materialNode = createMaterialNode("radialBlurMaterial_" + world.generateUniqueNodeID()); |
107 | this._materialNode.setShader(this._shader); | 107 | this._materialNode.setShader(this._shader); |
108 | 108 | ||
109 | this._time = 0; | 109 | this._time = 0; |