diff options
author | Armen Kesablyan | 2012-06-25 11:14:40 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-25 11:14:40 -0700 |
commit | 446f475c35e3d0d5d6cb6ca35346e548de6c36f9 (patch) | |
tree | 0b7e7154979754db2c0ebb7b7908c555068d515d /assets/canvas-runtime.js | |
parent | 7867aec2620b65605180979b5049cfa154ca7dd1 (diff) | |
parent | 35aebe8d72ccfa9ea010eb79c09ecf89cc1ed44d (diff) | |
download | ninja-446f475c35e3d0d5d6cb6ca35346e548de6c36f9.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'assets/canvas-runtime.js')
-rw-r--r-- | assets/canvas-runtime.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/assets/canvas-runtime.js b/assets/canvas-runtime.js index 13b36540..c441a98d 100644 --- a/assets/canvas-runtime.js +++ b/assets/canvas-runtime.js | |||
@@ -186,6 +186,7 @@ NinjaCvsRt.GLRuntime = Object.create(Object.prototype, { | |||
186 | this._canvas.rdgeid = id; | 186 | this._canvas.rdgeid = id; |
187 | RDGE.globals.engine.registerCanvas(this._canvas, this); | 187 | RDGE.globals.engine.registerCanvas(this._canvas, this); |
188 | RDGE.RDGEStart( this._canvas ); | 188 | RDGE.RDGEStart( this._canvas ); |
189 | this._canvas.task.start(); | ||
189 | } | 190 | } |
190 | else | 191 | else |
191 | { | 192 | { |