diff options
author | Eric Guzman | 2012-02-13 15:48:37 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-13 15:48:37 -0800 |
commit | b2672478decd3ee3bfacf86b525551c997f9604d (patch) | |
tree | 79a88684406d3adf00350246a4da884b97fb0eac /js/helper-classes/RDGE/src/core/script/runtime.js | |
parent | a738121a921e4c721b280434952b415b9ab3b1a8 (diff) | |
parent | 0620e2f788861e824d6e49fa319da4d20b18a556 (diff) | |
download | ninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz |
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/runtime.js')
-rw-r--r-- | js/helper-classes/RDGE/src/core/script/runtime.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/runtime.js b/js/helper-classes/RDGE/src/core/script/runtime.js index 8d8fdf38..18b9b223 100644 --- a/js/helper-classes/RDGE/src/core/script/runtime.js +++ b/js/helper-classes/RDGE/src/core/script/runtime.js | |||
@@ -179,7 +179,7 @@ RDGERequestAnimationFrame = (function() { | |||
179 | RDGETask = (function() { | 179 | RDGETask = (function() { |
180 | var tasks = {}; | 180 | var tasks = {}; |
181 | return function(canvas, startNow) { | 181 | return function(canvas, startNow) { |
182 | this.id = canvas.id; | 182 | this.id = canvas.rdgeid; |
183 | this.currTime = 0.0; | 183 | this.currTime = 0.0; |
184 | this.lastTime = 0.0; | 184 | this.lastTime = 0.0; |
185 | this.running = false; | 185 | this.running = false; |