Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into Textures

1 files changed, 8 insertions, 0 deletions

diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 4140208c..d314760b 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -118,6 +118,8 @@ var World = function GLWorld( canvas, use3D, preserveDrawingBuffer ) {
 
         this.getRenderer                        = function()            {  return this.renderer;                        };
 
+    // Flag to play/pause animation at authortime
+    this._previewAnimation = true;
   ////////////////////////////////////////////////////////////////////////////////////
   // RDGE
   // local variables
@@ -476,6 +478,10 @@ World.prototype.restartRenderLoop = function() {
                 if (this._allMapsLoaded) {
                         //console.log( "starting task" );
                         this._canvas.task.start();
+            if(!this._previewAnimation) {
+                //render only once if authortime animation is turned off
+                this._canvas.task.stop();
+            }
                 } else {
                         //console.log( "stopping task" );
                         this._canvas.task.stop();
@@ -731,6 +737,8 @@ World.prototype.getShapeFromPoint = function( offsetX, offsetY ) {
         }
 };
 
+
+
 World.prototype.exportJSON = function()
 {
         // world properties