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/helper-classes/backup-delete/Materials/MandelMaterial.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/helper-classes/backup-delete/Materials/MandelMaterial.js')
-rw-r--r-- | js/helper-classes/backup-delete/Materials/MandelMaterial.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/backup-delete/Materials/MandelMaterial.js b/js/helper-classes/backup-delete/Materials/MandelMaterial.js index 25b08404..df732ed2 100644 --- a/js/helper-classes/backup-delete/Materials/MandelMaterial.js +++ b/js/helper-classes/backup-delete/Materials/MandelMaterial.js | |||
@@ -74,7 +74,7 @@ function MandelMaterial() | |||
74 | this._shader.init(); | 74 | this._shader.init(); |
75 | 75 | ||
76 | // set up the material node | 76 | // set up the material node |
77 | this._materialNode = createMaterialNode("mandelMaterial"); | 77 | this._materialNode = createMaterialNode("mandelMaterial_" + world.generateUniqueNodeID()); |
78 | this._materialNode.setShader(this._shader); | 78 | this._materialNode.setShader(this._shader); |
79 | 79 | ||
80 | this._time = 0; | 80 | this._time = 0; |