diff options
| author | Jonathan Duran | 2012-04-10 08:13:00 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-04-10 08:13:00 -0700 |
| commit | 58e049b68e03abbacde93206d2666361022c0858 (patch) | |
| tree | f1ce6b8a378674d4abcac68acd0bcca93b838a39 /js/panels/Materials/materials-popup.reel/materials-popup.js | |
| parent | a9050f96d814469f420bcf3630d16d576b62258e (diff) | |
| parent | bd43ce383b050d03b0f92cc923c517febc66ca28 (diff) | |
| download | ninja-58e049b68e03abbacde93206d2666361022c0858.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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; |