diff options
| author | Jose Antonio Marquez | 2012-02-11 22:37:34 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-11 22:37:34 -0800 |
| commit | 9f2356c48b831d32d7278648656fe44b98bc4a1f (patch) | |
| tree | 58459a2e2e45ff2f4ffa9042740040ee17d91dfb /js/helper-classes/RDGE/GLCircle.js | |
| parent | 5eb38b8bd779c7fb6e59b966135f8d306378f034 (diff) | |
| parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
| download | ninja-9f2356c48b831d32d7278648656fe44b98bc4a1f.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
js/ninja.reel/ninja.html
Diffstat (limited to 'js/helper-classes/RDGE/GLCircle.js')
| -rwxr-xr-x | js/helper-classes/RDGE/GLCircle.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js index 942eb528..08057778 100755 --- a/js/helper-classes/RDGE/GLCircle.js +++ b/js/helper-classes/RDGE/GLCircle.js | |||
| @@ -133,6 +133,9 @@ function GLCircle() | |||
| 133 | if (!world) throw( "null world in buildBuffers" ); | 133 | if (!world) throw( "null world in buildBuffers" ); |
| 134 | 134 | ||
| 135 | if (!world._useWebGL) return; | 135 | if (!world._useWebGL) return; |
| 136 | |||
| 137 | // make sure RDGE has the correct context | ||
| 138 | g_Engine.setContext( world.getCanvas().uuid ); | ||
| 136 | 139 | ||
| 137 | // create the gl buffer | 140 | // create the gl buffer |
| 138 | var gl = world.getGLContext(); | 141 | var gl = world.getGLContext(); |