diff options
| author | Pushkar Joshi | 2012-02-08 15:42:40 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-08 15:42:40 -0800 |
| commit | 18243deb66ab14a014756bfb0be1a52648c7771a (patch) | |
| tree | c64660f7f69840cac5186fd730221335bd0a67af /js/helper-classes/RDGE/GLWorld.js | |
| parent | 802e92eb70b00849dadacf2c6590d27edbe65d99 (diff) | |
| parent | 0537f8f29e7b8dd48fd08f20b1533fbe92a54c4b (diff) | |
| download | ninja-18243deb66ab14a014756bfb0be1a52648c7771a.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/MaterialsLibrary.js
Diffstat (limited to 'js/helper-classes/RDGE/GLWorld.js')
| -rw-r--r-- | js/helper-classes/RDGE/GLWorld.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/js/helper-classes/RDGE/GLWorld.js b/js/helper-classes/RDGE/GLWorld.js index 819f89db..b86d9715 100644 --- a/js/helper-classes/RDGE/GLWorld.js +++ b/js/helper-classes/RDGE/GLWorld.js | |||
| @@ -389,7 +389,8 @@ function GLWorld( canvas, use3D ) | |||
| 389 | { | 389 | { |
| 390 | rdgeStarted = true; | 390 | rdgeStarted = true; |
| 391 | 391 | ||
| 392 | this._canvas.rdgeid = this._canvas.uuid; | 392 | // TODO - temporary fix for RDGE id's |
| 393 | this._canvas.id = "rdge_" + this._canvas.uuid; | ||
| 393 | g_Engine.registerCanvas(this._canvas, this); | 394 | g_Engine.registerCanvas(this._canvas, this); |
| 394 | RDGEStart( this._canvas ); | 395 | RDGEStart( this._canvas ); |
| 395 | 396 | ||