aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-23 11:41:11 -0700
committerNivesh Rajbhandari2012-03-23 11:41:11 -0700
commit8e9ac98ea1001289cb3834b262200eee253cb408 (patch)
tree7263d112fb30137e3122c4ca9405097fa8bd9d13 /js/ninja.reel
parent388d8e469e4641553b67aece4fc1d56d9789fff5 (diff)
downloadninja-8e9ac98ea1001289cb3834b262200eee253cb408.tar.gz
Respect play/pause WebGL animation when saving files and re-rendering caused by geometry changes.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.js2
1 files changed, 2 insertions, 0 deletions
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, {
179 for(var i = 0, len = glCanvases.length; i<len; i++) { 179 for(var i = 0, len = glCanvases.length; i<len; i++) {
180 glShapeModel = glCanvases[i].elementModel.shapeModel; 180 glShapeModel = glCanvases[i].elementModel.shapeModel;
181 if(inLivePreview) { 181 if(inLivePreview) {
182 glShapeModel.GLWorld._previewAnimation = true;
182 glShapeModel.GLWorld.restartRenderLoop(); 183 glShapeModel.GLWorld.restartRenderLoop();
183 } else if (!glShapeModel.animate ) { 184 } else if (!glShapeModel.animate ) {
185 glShapeModel.GLWorld._previewAnimation = false;
184 glShapeModel.GLWorld._canvas.task.stop(); 186 glShapeModel.GLWorld._canvas.task.stop();
185 } 187 }
186 } 188 }