diff options
| author | Nivesh Rajbhandari | 2012-03-27 09:32:53 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-03-27 09:32:53 -0700 |
| commit | 406bbfc63f8ed42d7da105dbd068a49ff8fb5f09 (patch) | |
| tree | 3a8b45f4802f002269ff1bcf596f94cee4679a07 /js/lib/rdge/materials/mandel-material.js | |
| parent | bda9f8f5829c943486f8850e68c991e83f8fb8c8 (diff) | |
| parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
| download | ninja-406bbfc63f8ed42d7da105dbd068a49ff8fb5f09.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/lib/rdge/materials/mandel-material.js')
| -rw-r--r-- | js/lib/rdge/materials/mandel-material.js | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/js/lib/rdge/materials/mandel-material.js b/js/lib/rdge/materials/mandel-material.js index d9f00383..e7b105e1 100644 --- a/js/lib/rdge/materials/mandel-material.js +++ b/js/lib/rdge/materials/mandel-material.js | |||
| @@ -21,11 +21,7 @@ var MandelMaterial = function MandelMaterial() { | |||
| 21 | /////////////////////////////////////////////////////////////////////// | 21 | /////////////////////////////////////////////////////////////////////// |
| 22 | // Properties | 22 | // Properties |
| 23 | /////////////////////////////////////////////////////////////////////// | 23 | /////////////////////////////////////////////////////////////////////// |
| 24 | // no properties | 24 | // properties inherited from PulseMaterial |
| 25 | this._propNames = []; | ||
| 26 | this._propLabels = []; | ||
| 27 | this._propTypes = []; | ||
| 28 | this._propValues = []; | ||
| 29 | 25 | ||
| 30 | /////////////////////////////////////////////////////////////////////// | 26 | /////////////////////////////////////////////////////////////////////// |
| 31 | // Material Property Accessors | 27 | // Material Property Accessors |