diff options
| author | Jose Antonio Marquez | 2012-02-08 13:14:29 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-08 13:14:29 -0800 |
| commit | 9b45b897949bf934c8bf2c90ee2ff78f8713cb12 (patch) | |
| tree | e7c276a3934c823cab894f46ee7dc5d3eda9ca83 /js/helper-classes/RDGE/GLWorld.js | |
| parent | aa01c1210f3a4d9fd55a771b9de2c58ee3fa4bb6 (diff) | |
| parent | 10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 (diff) | |
| download | ninja-9b45b897949bf934c8bf2c90ee2ff78f8713cb12.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
Diffstat (limited to 'js/helper-classes/RDGE/GLWorld.js')
| -rw-r--r-- | js/helper-classes/RDGE/GLWorld.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/RDGE/GLWorld.js b/js/helper-classes/RDGE/GLWorld.js index cc44da50..59f0bda0 100644 --- a/js/helper-classes/RDGE/GLWorld.js +++ b/js/helper-classes/RDGE/GLWorld.js | |||
| @@ -240,7 +240,7 @@ function GLWorld( canvas, use3D ) | |||
| 240 | rdgeStarted = true; | 240 | rdgeStarted = true; |
| 241 | 241 | ||
| 242 | // TODO - temporary fix for RDGE id's | 242 | // TODO - temporary fix for RDGE id's |
| 243 | this._canvas.id = this._canvas.uuid; | 243 | this._canvas.id = "rdge_" + this._canvas.uuid; |
| 244 | 244 | ||
| 245 | g_Engine.registerCanvas(this._canvas, this); | 245 | g_Engine.registerCanvas(this._canvas, this); |
| 246 | RDGEStart( this._canvas ); | 246 | RDGEStart( this._canvas ); |