diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/panels/Materials/materials-data.json | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/panels/Materials/materials-data.json')
| -rw-r--r-- | js/panels/Materials/materials-data.json | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/js/panels/Materials/materials-data.json b/js/panels/Materials/materials-data.json index a5d8997b..fde82d3d 100644 --- a/js/panels/Materials/materials-data.json +++ b/js/panels/Materials/materials-data.json | |||
| @@ -101,6 +101,11 @@ | |||
| 101 | "id" : "Z-Invert" | 101 | "id" : "Z-Invert" |
| 102 | } | 102 | } |
| 103 | ] | 103 | ] |
| 104 | }, | ||
| 105 | { | ||
| 106 | "label": "Custom Materials", | ||
| 107 | "children": [ | ||
| 108 | ] | ||
| 104 | } | 109 | } |
| 105 | ] | 110 | ] |
| 106 | } \ No newline at end of file | 111 | } \ No newline at end of file |