diff options
| author | Ananya Sen | 2012-02-29 15:21:31 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-29 15:21:31 -0800 |
| commit | 8fee7d6bdb55ba18f396c3523081b18499fa1e30 (patch) | |
| tree | dbd17232983247a38bb6b2cea480242bdf3f2422 /js/helper-classes/RDGE/GLWorld.js | |
| parent | 5d4f1aad01737695238582c704e6d4f2c3a2f317 (diff) | |
| parent | b09956e4a9a35c5588cc7cd1f01efb617cbe0884 (diff) | |
| download | ninja-8fee7d6bdb55ba18f396c3523081b18499fa1e30.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into FileIO
Conflicts:
js/controllers/selection-controller.js
js/document/html-document.js
js/panels/properties/content.reel/content.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/helper-classes/RDGE/GLWorld.js')
| -rwxr-xr-x | 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 64086bee..8017207f 100755 --- a/js/helper-classes/RDGE/GLWorld.js +++ b/js/helper-classes/RDGE/GLWorld.js | |||
| @@ -157,7 +157,7 @@ function GLWorld( canvas, use3D ) | |||
| 157 | 157 | ||
| 158 | // change clear color | 158 | // change clear color |
| 159 | //this.renderer.setClearFlags(g_Engine.getContext().DEPTH_BUFFER_BIT); | 159 | //this.renderer.setClearFlags(g_Engine.getContext().DEPTH_BUFFER_BIT); |
| 160 | this.renderer.setClearColor([1.0, 1.0, 1.0, 0.0]); | 160 | this.renderer.setClearColor([0.0, 0.0, 0.0, 0.0]); |
| 161 | //this.renderer.NinjaWorld = this; | 161 | //this.renderer.NinjaWorld = this; |
| 162 | 162 | ||
| 163 | // create an empty scene graph | 163 | // create an empty scene graph |