3 files changed, 10 insertions, 0 deletions

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 9b2fa618..b060b751 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -109,11 +109,13 @@ exports.ShapesController = Montage.create(CanvasController, {
                     if(value)
                     {
                         el.elementModel.shapeModel.animate = true;
+                        el.elementModel.shapeModel.GLWorld._previewAnimation = true;
                         el.elementModel.shapeModel.GLWorld.restartRenderLoop();
                     }
                     else
                     {
                         el.elementModel.shapeModel.animate = false;
+                        el.elementModel.shapeModel.GLWorld._previewAnimation = false;
                         el.elementModel.shapeModel.GLWorld._canvas.task.stop();
                     }
                     break;
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js
index 07a2c3ae..b87c6272 100755
--- a/js/lib/drawing/world.js
+++ b/js/lib/drawing/world.js
@@ -117,6 +117,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
@@ -475,6 +477,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();
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 7db2a82c..c76c7d46 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -179,8 +179,10 @@ exports.Ninja = Montage.create(Component, {
                 for(var i = 0, len = glCanvases.length; i<len; i++) {
                     glShapeModel = glCanvases[i].elementModel.shapeModel;
                     if(inLivePreview) {
+                        glShapeModel.GLWorld._previewAnimation = true;
                         glShapeModel.GLWorld.restartRenderLoop();
                     } else if (!glShapeModel.animate ) {
+                        glShapeModel.GLWorld._previewAnimation = false;
                         glShapeModel.GLWorld._canvas.task.stop();
                     }
                 }