diff options
| author | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-13 21:43:51 -0800 |
| commit | 081f17954c735fc8b946d72a25b0ee60d370ef9b (patch) | |
| tree | de7b50f2d02365df897ef4356f953d3833c9cabd /js/helper-classes/RDGE/GLCircle.js | |
| parent | 47df0aff81c25334b129047bb227ea5015357eda (diff) | |
| parent | 1d82f1a041612f32bbf6c9f20d9fb14e2d11fcc7 (diff) | |
| download | ninja-081f17954c735fc8b946d72a25b0ee60d370ef9b.tar.gz | |
Merge branch 'refs/heads/master' into components
Conflicts:
js/components/treeview/ninja-leaf.reel/ninja-leaf.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/helper-classes/RDGE/GLCircle.js')
| -rw-r--r-- | 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 100644 --- 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(); |