aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/GLWorld.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-08 10:18:36 -0800
committerValerio Virgillito2012-02-08 10:18:36 -0800
commit763910b9d074137eb7dee80447b89407ce5750c9 (patch)
tree3c8820a06afd442fa5ba8e68665a4d2836230628 /js/helper-classes/RDGE/GLWorld.js
parente5579374ff39b80b8c0c69faba37f6f581758fe0 (diff)
parent329a859e2666716c3a1d99c6bd2679e10c81fc8d (diff)
downloadninja-763910b9d074137eb7dee80447b89407ce5750c9.tar.gz
Merge pull request #20 from mqg734/ToolFixes
Hooked up materials code to go through the ShapesController and updated the PI to reflect the currently selected shape's materials. Also fixed the following bugs:
Diffstat (limited to 'js/helper-classes/RDGE/GLWorld.js')
-rw-r--r--js/helper-classes/RDGE/GLWorld.js2
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 );