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/RadialBlurMaterial.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/RadialBlurMaterial.js')
-rw-r--r-- | js/helper-classes/RDGE/Materials/RadialBlurMaterial.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js b/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js index 25331b54..9acb4213 100644 --- a/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js +++ b/js/helper-classes/RDGE/Materials/RadialBlurMaterial.js | |||
@@ -92,6 +92,9 @@ function RadialBlurMaterial() | |||
92 | 92 | ||
93 | this.init = function( world ) | 93 | this.init = function( world ) |
94 | { | 94 | { |
95 | // save the world | ||
96 | if (world) this.setWorld( world ); | ||
97 | |||
95 | // set up the shader | 98 | // set up the shader |
96 | this._shader = new jshader(); | 99 | this._shader = new jshader(); |
97 | this._shader.def = radialBlurMaterialDef; | 100 | this._shader.def = radialBlurMaterialDef; |