diff options
| author | Jonathan Duran | 2012-03-14 08:59:17 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-03-14 08:59:17 -0700 |
| commit | e065244ac75d1d0f25fd5c75cb58e714a13fe16b (patch) | |
| tree | 6b49a85a45fdd41b81be5603fbbc2e0d197eb187 /js/helper-classes/backup-delete/Materials/DeformMaterial.js | |
| parent | e8f207dc50ad942ee8c1c1db6b146c0110ce3216 (diff) | |
| download | ninja-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/DeformMaterial.js')
| -rw-r--r-- | js/helper-classes/backup-delete/Materials/DeformMaterial.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/backup-delete/Materials/DeformMaterial.js b/js/helper-classes/backup-delete/Materials/DeformMaterial.js index ddc97383..b7101227 100644 --- a/js/helper-classes/backup-delete/Materials/DeformMaterial.js +++ b/js/helper-classes/backup-delete/Materials/DeformMaterial.js | |||
| @@ -71,7 +71,7 @@ function DeformMaterial() | |||
| 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("deformMaterial"); | 74 | this._materialNode = createMaterialNode("deformMaterial_" + world.generateUniqueNodeID()); |
| 75 | this._materialNode.setShader(this._shader); | 75 | this._materialNode.setShader(this._shader); |
| 76 | 76 | ||
| 77 | this._time = 0; | 77 | this._time = 0; |