diff options
| author | hwc487 | 2012-02-07 14:42:51 -0800 |
|---|---|---|
| committer | hwc487 | 2012-02-07 14:42:51 -0800 |
| commit | 6173fe8440152b1e4c63834a6b4dc7573d532339 (patch) | |
| tree | d23449204ae7f23cb9bab09836d126e90c30484b /js/helper-classes/RDGE/GLWorld.js | |
| parent | 2d4da18a778471b02e188ad668752e331ee76127 (diff) | |
| parent | aec849d91e4b697d496b9ede28b5d89cf2283781 (diff) | |
| download | ninja-6173fe8440152b1e4c63834a6b4dc7573d532339.tar.gz | |
Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working
Conflicts:
js/helper-classes/RDGE/GLRectangle.js
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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/js/helper-classes/RDGE/GLWorld.js b/js/helper-classes/RDGE/GLWorld.js index 83ed717d..afd61c8a 100644 --- a/js/helper-classes/RDGE/GLWorld.js +++ b/js/helper-classes/RDGE/GLWorld.js | |||
| @@ -389,8 +389,10 @@ function GLWorld( canvas, use3D ) | |||
| 389 | rdgeStarted = true; | 389 | rdgeStarted = true; |
| 390 | 390 | ||
| 391 | this._canvas.rdgeid = this._canvas.uuid; | 391 | this._canvas.rdgeid = this._canvas.uuid; |
| 392 | g_Engine.registerCanvas(this._canvas, this); | 392 | this._canvas.id = this._canvas.uuid; |
| 393 | RDGEStart( this._canvas ); | 393 | |
| 394 | g_Engine.registerCanvas(this._canvas, this); | ||
| 395 | RDGEStart( this._canvas ); | ||
| 394 | 396 | ||
| 395 | //this._canvas.fpsTracker = new fpsTracker( '0' ); | 397 | //this._canvas.fpsTracker = new fpsTracker( '0' ); |
| 396 | //this._canvas.task = new RDGETask(this._canvas, false); | 398 | //this._canvas.task = new RDGETask(this._canvas, false); |