Merge branch 'refs/heads/master' into binding

Conflicts:
	js/ninja.reel/ninja.html

Signed-off-by: Armen Kesablyan <armen@motorola.com>

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) {
 

     RDGE.globals.engine.registerCanvas(canvas);

 

-    canvas.task = new RDGE.RDGETask(canvas, true);

+        if (!canvas.task)

+        {

+                //canvas.task = new RDGE.RDGETask(canvas, true);

+                canvas.task = new RDGE.RDGETask(canvas, false);

+        }

 

     if (!RDGE.globals.shaderMan)

         RDGE.globals.shaderMan = new RDGE.ShaderManager();