diff options
| author | Eric Guzman | 2012-03-12 15:33:04 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-12 15:33:04 -0700 |
| commit | 7e3161153b87b891875ac65368a19aed12909fa3 (patch) | |
| tree | b80f48d711a9729fc39dbbdff28c4f0620e7302d /js/stage/stage-deps.js | |
| parent | 7a28932ba8a7517bbaaabe1f5edf678416aafc9c (diff) | |
| parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
| download | ninja-7e3161153b87b891875ac65368a19aed12909fa3.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'js/stage/stage-deps.js')
| -rwxr-xr-x | js/stage/stage-deps.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js index 16f2c652..a71b77be 100755 --- a/js/stage/stage-deps.js +++ b/js/stage/stage-deps.js | |||
| @@ -125,7 +125,7 @@ exports.StageDeps = Montage.create(Component, { | |||
| 125 | handleOpenDocument: { | 125 | handleOpenDocument: { |
| 126 | value: function() { | 126 | value: function() { |
| 127 | 127 | ||
| 128 | workingPlane = Vector.create( [0,0,1,0] ); | 128 | workingPlane = [0,0,1,0]; |
| 129 | 129 | ||
| 130 | snapManager.setCurrentStage(this.currentStage); | 130 | snapManager.setCurrentStage(this.currentStage); |
| 131 | 131 | ||
| @@ -151,7 +151,7 @@ exports.StageDeps = Montage.create(Component, { | |||
| 151 | reinitializeForSwitchDocument: { | 151 | reinitializeForSwitchDocument: { |
| 152 | value: function() { | 152 | value: function() { |
| 153 | 153 | ||
| 154 | workingPlane = Vector.create( [0,0,1,0] ); | 154 | workingPlane = [0,0,1,0]; |
| 155 | 155 | ||
| 156 | snapManager.setCurrentStage(this.currentStage); | 156 | snapManager.setCurrentStage(this.currentStage); |
| 157 | 157 | ||