diff options
| author | Jonathan Duran | 2012-03-29 07:27:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-03-29 07:27:27 -0700 |
| commit | ab730848419a0b72c4c2747a3c928f2c8cc763e7 (patch) | |
| tree | 6b48b82604e194016ca048ad912f8015de719999 /js/lib/rdge/materials/mandel-material.js | |
| parent | 06f247d881f4cfd790d635c6e310ae7f97724339 (diff) | |
| parent | 3fd2cdb59027b3f973b9165db9db4fdd22026941 (diff) | |
| download | ninja-ab730848419a0b72c4c2747a3c928f2c8cc763e7.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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 |