diff options
| author | Pushkar Joshi | 2012-04-17 14:49:18 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-17 14:49:18 -0700 |
| commit | df903a01e14134cadf109b733d09c6eadfa3966b (patch) | |
| tree | 2351f1c05b2f852053fa0be533072088a9ad4e7c /js/panels/Materials/materials-popup.reel/materials-popup.js | |
| parent | 036cf034e124dbc1f4893e90f7c6d240904a3faf (diff) | |
| parent | cacb4a21825818af392c2949967b0f3c1df509c5 (diff) | |
| download | ninja-df903a01e14134cadf109b733d09c6eadfa3966b.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/tools/PenTool.js
Diffstat (limited to 'js/panels/Materials/materials-popup.reel/materials-popup.js')
| -rwxr-xr-x | js/panels/Materials/materials-popup.reel/materials-popup.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js index b44761bc..bbccf45d 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.js +++ b/js/panels/Materials/materials-popup.reel/materials-popup.js | |||
| @@ -237,7 +237,7 @@ exports.MaterialsPopup = Montage.create(Component, { | |||
| 237 | } | 237 | } |
| 238 | else | 238 | else |
| 239 | { | 239 | { |
| 240 | this.materialsData = this._dummyData1; | 240 | this.materialsData = this._dummyData1.slice(0); |
| 241 | } | 241 | } |
| 242 | 242 | ||
| 243 | this.needsDraw = true; | 243 | this.needsDraw = true; |