aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/RDGE/src
diff options
context:
space:
mode:
authorJonathan Duran2012-06-25 13:40:37 -0700
committerJonathan Duran2012-06-25 13:40:37 -0700
commit8b46c251664a45039db355075bce85ddfd345269 (patch)
tree0de66b839b0c9107077705ee6f5efe737725207d /js/helper-classes/RDGE/src
parentda3d11366fa6f42a99cbd8998eebd5fe572b76bc (diff)
parent4e5331c9967d4a24df56160188cc916a4051052b (diff)
downloadninja-8b46c251664a45039db355075bce85ddfd345269.tar.gz
Merge branch 'refs/heads/NINJAmaster' into Timeline-bugfix1
Diffstat (limited to 'js/helper-classes/RDGE/src')
-rwxr-xr-xjs/helper-classes/RDGE/src/core/script/runtime.js6
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();