diff options
| author | Pushkar Joshi | 2012-02-28 14:01:05 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-28 14:01:05 -0800 |
| commit | 63307c9abf120985d979a40a53a0598d3f0d5c5a (patch) | |
| tree | 57d9cffd7aa0959ea31fe0fa2d89a9080198bcb3 /js/helper-classes/RDGE/GLCircle.js | |
| parent | e1a65d0c2a13e12ee53be98c731616e35aa07a41 (diff) | |
| parent | 7c9291a5bab4abd849547f8878f6fb962fc88250 (diff) | |
| download | ninja-63307c9abf120985d979a40a53a0598d3f0d5c5a.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
manifest.json
Diffstat (limited to 'js/helper-classes/RDGE/GLCircle.js')
| -rwxr-xr-x | js/helper-classes/RDGE/GLCircle.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js index 5b32547e..712544c0 100755 --- a/js/helper-classes/RDGE/GLCircle.js +++ b/js/helper-classes/RDGE/GLCircle.js | |||
| @@ -135,7 +135,7 @@ function GLCircle() | |||
| 135 | if (!world._useWebGL) return; | 135 | if (!world._useWebGL) return; |
| 136 | 136 | ||
| 137 | // make sure RDGE has the correct context | 137 | // make sure RDGE has the correct context |
| 138 | g_Engine.setContext( world.getCanvas().uuid ); | 138 | g_Engine.setContext( world.getCanvas().rdgeid ); |
| 139 | 139 | ||
| 140 | // create the gl buffer | 140 | // create the gl buffer |
| 141 | var gl = world.getGLContext(); | 141 | var gl = world.getGLContext(); |