diff options
| author | Jose Antonio Marquez | 2012-03-26 15:36:49 -0700 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-03-26 15:36:49 -0700 |
| commit | 7bf738bc08f6a24edce30dbc2b101a8cab2d27aa (patch) | |
| tree | af3b114d6a83ae62dfcead8bd61bc62efe0c9516 /js/lib/rdge/materials/julia-material.js | |
| parent | d87cded11dcc0faf41a4a3e6b587e5549c0da6df (diff) | |
| parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
| download | ninja-7bf738bc08f6a24edce30dbc2b101a8cab2d27aa.tar.gz | |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/lib/rdge/materials/julia-material.js')
| -rw-r--r-- | js/lib/rdge/materials/julia-material.js | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js index 976dfad3..a85bd6f7 100644 --- a/js/lib/rdge/materials/julia-material.js +++ b/js/lib/rdge/materials/julia-material.js | |||
| @@ -21,11 +21,7 @@ var JuliaMaterial = function JuliaMaterial() { | |||
| 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 | // Methods | 27 | // Methods |