diff options
| author | Nivesh Rajbhandari | 2012-02-09 12:02:27 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-02-09 12:02:27 -0800 |
| commit | a9b1a1f2642841c4165ede69d131b1deb6238622 (patch) | |
| tree | 2076dc497fbde041283af8b0082b0f4e24c9e1c6 /js/helper-classes/RDGE/src/core/script/runtime.js | |
| parent | 31e2eb0d0da9b032116ad073918ca36ec11dac45 (diff) | |
| parent | ce81a3f4387d80f9ac406e73b843fb5dbe9cf432 (diff) | |
| download | ninja-a9b1a1f2642841c4165ede69d131b1deb6238622.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into SnapManagerFixes
Conflicts:
js/helper-classes/RDGE/Materials/FlatMaterial.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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; |