diff options
| author | Valerio Virgillito | 2012-06-06 17:04:34 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-06 17:04:34 -0700 |
| commit | 6442dcc0cc4088d28558a9c121c6a91cba3ff078 (patch) | |
| tree | 8f2f2db6097104e44c8d87e11466d1f3124c7f3a /js/stage | |
| parent | 488ae8d98deb30009cb8b5b2da464fe52940050b (diff) | |
| parent | 47e0e1f047e83b71c3f86812a45d33904201cc7a (diff) | |
| download | ninja-6442dcc0cc4088d28558a9c121c6a91cba3ff078.tar.gz | |
Merge branch 'refs/heads/master' into element-model-fixes
Conflicts:
js/tools/LineTool.js
js/tools/ShapeTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/stage')
| -rwxr-xr-x | js/stage/stage.reel/stage.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 8d1c087d..30ee1e40 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
| @@ -242,7 +242,7 @@ exports.Stage = Montage.create(Component, { | |||
| 242 | 242 | ||
| 243 | // Hack for now until a full component | 243 | // Hack for now until a full component |
| 244 | this.layout.draw(); | 244 | this.layout.draw(); |
| 245 | if(this.currentDocument) { | 245 | if(this.currentDocument && (this.currentDocument.currentView === "design")) { |
| 246 | this.layout.draw3DInfo(true); | 246 | this.layout.draw3DInfo(true); |
| 247 | } | 247 | } |
| 248 | } else if(this.updatedStage) { | 248 | } else if(this.updatedStage) { |