diff options
| author | Nivesh Rajbhandari | 2012-02-09 12:02:27 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-02-09 12:02:27 -0800 |
| commit | a9b1a1f2642841c4165ede69d131b1deb6238622 (patch) | |
| tree | 2076dc497fbde041283af8b0082b0f4e24c9e1c6 /js/helper-classes/RDGE/Materials/PlasmaMaterial.js | |
| parent | 31e2eb0d0da9b032116ad073918ca36ec11dac45 (diff) | |
| parent | ce81a3f4387d80f9ac406e73b843fb5dbe9cf432 (diff) | |
| download | ninja-a9b1a1f2642841c4165ede69d131b1deb6238622.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into SnapManagerFixes
Conflicts:
js/helper-classes/RDGE/Materials/FlatMaterial.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/helper-classes/RDGE/Materials/PlasmaMaterial.js')
| -rw-r--r-- | js/helper-classes/RDGE/Materials/PlasmaMaterial.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/helper-classes/RDGE/Materials/PlasmaMaterial.js b/js/helper-classes/RDGE/Materials/PlasmaMaterial.js index f900b35a..a65f3a33 100644 --- a/js/helper-classes/RDGE/Materials/PlasmaMaterial.js +++ b/js/helper-classes/RDGE/Materials/PlasmaMaterial.js | |||
| @@ -32,6 +32,8 @@ function PlasmaMaterial() | |||
| 32 | /////////////////////////////////////////////////////////////////////// | 32 | /////////////////////////////////////////////////////////////////////// |
| 33 | this.getShaderName = function() { return this._shaderName; } | 33 | this.getShaderName = function() { return this._shaderName; } |
| 34 | 34 | ||
| 35 | this.isAnimated = function() { return true; } | ||
| 36 | |||
| 35 | /////////////////////////////////////////////////////////////////////// | 37 | /////////////////////////////////////////////////////////////////////// |
| 36 | // Material Property Accessors | 38 | // Material Property Accessors |
| 37 | /////////////////////////////////////////////////////////////////////// | 39 | /////////////////////////////////////////////////////////////////////// |