diff options
| author | Eric Guzman | 2012-03-13 13:12:43 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-13 13:12:43 -0700 |
| commit | 61fd46cad105f0a52afa028e5301b96120f00ab4 (patch) | |
| tree | d8a7e23e1ea7d9b5c64a288822b7797bb19e50d4 /js/helper-classes/RDGE/src/core/script/jshader.js | |
| parent | 7e3161153b87b891875ac65368a19aed12909fa3 (diff) | |
| parent | f56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff) | |
| download | ninja-61fd46cad105f0a52afa028e5301b96120f00ab4.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/jshader.js')
| -rwxr-xr-x | js/helper-classes/RDGE/src/core/script/jshader.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/jshader.js b/js/helper-classes/RDGE/src/core/script/jshader.js index 36c5939e..ceb67536 100755 --- a/js/helper-classes/RDGE/src/core/script/jshader.js +++ b/js/helper-classes/RDGE/src/core/script/jshader.js | |||
| @@ -191,8 +191,8 @@ jshader = function(addr) { | |||
| 191 | case "mat2": this.data = [0, 0, 0, 0]; break; | 191 | case "mat2": this.data = [0, 0, 0, 0]; break; |
| 192 | case "float": this.data = [0]; break; | 192 | case "float": this.data = [0]; break; |
| 193 | case "int": this.data = [0]; break; | 193 | case "int": this.data = [0]; break; |
| 194 | case "tex2d": this.data = [ctx.canvas.renderer.getTextureByName("assets/images/white.png")]; break; | 194 | case "tex2d": this.data = [ctx.canvas.renderer.getTextureByName(g_Engine._assetPath+"images/white.png")]; break; |
| 195 | case "texCube": this.data = [ctx.canvas.renderer.getTextureByName("assets/images/white.png")]; break; | 195 | case "texCube": this.data = [ctx.canvas.renderer.getTextureByName(g_Engine._assetPath+"images/white.png")]; break; |
| 196 | } | 196 | } |
| 197 | } | 197 | } |
| 198 | else { | 198 | else { |
| @@ -243,8 +243,8 @@ jshader = function(addr) { | |||
| 243 | case "mat2": this.data = [0, 0, 0, 0]; break; | 243 | case "mat2": this.data = [0, 0, 0, 0]; break; |
| 244 | case "float": this.data = [0]; break; | 244 | case "float": this.data = [0]; break; |
| 245 | case "int": this.data = [0]; break; | 245 | case "int": this.data = [0]; break; |
| 246 | case "tex2d": this.data = [ctx.canvas.renderer.getTextureByName("assets/images/white.png")]; break; | 246 | case "tex2d": this.data = [ctx.canvas.renderer.getTextureByName(g_Engine._assetPath+"images/white.png")]; break; |
| 247 | case "texCube": this.data = [ctx.canvas.renderer.getTextureByName("assets/images/white.png")]; break; | 247 | case "texCube": this.data = [ctx.canvas.renderer.getTextureByName(g_Engine._assetPath+"images/white.png")]; break; |
| 248 | } | 248 | } |
| 249 | } | 249 | } |
| 250 | else { | 250 | else { |