diff options
| author | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-03-27 09:10:58 -0700 |
| commit | 0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch) | |
| tree | e778f2b9d5d525aa364360d5996536a0a06379bd /js/lib/rdge/materials/mandel-material.js | |
| parent | 753244b4713243ab19ca246be674f0b45fb85b72 (diff) | |
| parent | 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff) | |
| download | ninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz | |
Merge branch 'master' into brushtool
Conflicts:
js/controllers/elements/shapes-controller.js
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 |