diff options
| author | John Mayhew | 2012-02-10 16:04:19 -0800 |
|---|---|---|
| committer | John Mayhew | 2012-02-10 16:04:19 -0800 |
| commit | 730c1e191e36b8ab8dba576c481a6585e0dfa69e (patch) | |
| tree | c86445ff8d1981e97096ec5e9f6cc5301dc9ea40 /js/helper-classes/RDGE/Materials/PlasmaMaterial.js | |
| parent | cde1dd9a9156b9682fdf85ce2cd4acdd94124c37 (diff) | |
| parent | 48977780443d97b9e97b047066639c9056788041 (diff) | |
| download | ninja-730c1e191e36b8ab8dba576c481a6585e0dfa69e.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/ninja.reel/ninja.html
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 | /////////////////////////////////////////////////////////////////////// |