diff options
| author | hwc487 | 2012-03-22 15:47:11 -0700 |
|---|---|---|
| committer | hwc487 | 2012-03-22 15:47:11 -0700 |
| commit | e927e4702d7dbd4a878f6979b3f56b46758f93de (patch) | |
| tree | e6bb8951374a6504bd6c745ce7233da5cd4869dc /js/lib/rdge/materials/mandel-material.js | |
| parent | 00cd98e49c959906d7c44bb6adcdef1f3d5148ae (diff) | |
| parent | 31e924e1b8b8da8342b3ff2341c8284915486c0b (diff) | |
| download | ninja-e927e4702d7dbd4a878f6979b3f56b46758f93de.tar.gz | |
Merge branch 'integration' of github.com:ericmueller/ninja-internal into Textures
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 |