diff options
author | Jonathan Duran | 2012-06-26 08:13:49 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-26 08:13:49 -0700 |
commit | 1bc2fb4441387877bc6b1aef78e4e466f526f60f (patch) | |
tree | eef16b66f6771862efac72aaeaa692c9e322c161 /js/helper-classes/RDGE/src/core | |
parent | 616ade06c8f669d18c27d27c3ee46a9c844a54ca (diff) | |
parent | d2e88bb251efb29f13911942f1f91101715c727e (diff) | |
download | ninja-1bc2fb4441387877bc6b1aef78e4e466f526f60f.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/helper-classes/RDGE/src/core')
-rwxr-xr-x | js/helper-classes/RDGE/src/core/script/runtime.js | 6 |
1 files changed, 5 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 eb327d1f..274c1f8a 100755 --- a/js/helper-classes/RDGE/src/core/script/runtime.js +++ b/js/helper-classes/RDGE/src/core/script/runtime.js | |||
@@ -94,7 +94,11 @@ RDGE.RDGEStart = function (canvasOrID) { | |||
94 | 94 | ||
95 | RDGE.globals.engine.registerCanvas(canvas); | 95 | RDGE.globals.engine.registerCanvas(canvas); |
96 | 96 | ||
97 | canvas.task = new RDGE.RDGETask(canvas, true); | 97 | if (!canvas.task) |
98 | { | ||
99 | //canvas.task = new RDGE.RDGETask(canvas, true); | ||
100 | canvas.task = new RDGE.RDGETask(canvas, false); | ||
101 | } | ||
98 | 102 | ||
99 | if (!RDGE.globals.shaderMan) | 103 | if (!RDGE.globals.shaderMan) |
100 | RDGE.globals.shaderMan = new RDGE.ShaderManager(); | 104 | RDGE.globals.shaderMan = new RDGE.ShaderManager(); |