aboutsummaryrefslogtreecommitdiff
path: root/js/lib/rdge/materials
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-23 17:06:31 -0700
committerValerio Virgillito2012-07-23 17:06:31 -0700
commit448668262b3e91ff5b8931c38c99631bcd25cd57 (patch)
tree981e350e5cc1238286c8d47afd6e5445a5a39500 /js/lib/rdge/materials
parent8c411448bc595a5bebd75382ea2cff31fc045151 (diff)
parente9d08c7af751d75af16371fcac06fd1af8a60fac (diff)
downloadninja-448668262b3e91ff5b8931c38c99631bcd25cd57.tar.gz
Merge branch 'SevenDotOneCommits' of https://github.com/ericmueller/ninja into v0.7.1
Diffstat (limited to 'js/lib/rdge/materials')
-rwxr-xr-xjs/lib/rdge/materials/material.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/js/lib/rdge/materials/material.js b/js/lib/rdge/materials/material.js
index e8571e9d..227a772a 100755
--- a/js/lib/rdge/materials/material.js
+++ b/js/lib/rdge/materials/material.js
@@ -263,6 +263,10 @@ var Material = function GLMaterial( world ) {
263 var material = this._materialNode; 263 var material = this._materialNode;
264 if (material) technique = material.shaderProgram[this.getTechniqueName()]; 264 if (material) technique = material.shaderProgram[this.getTechniqueName()];
265 265
266 // make sure RDGE has the correct context
267 if (this.getWorld())
268 RDGE.globals.engine.setContext( this.getWorld().getCanvas().rdgeid );
269
266 if(prop === "gradient") { 270 if(prop === "gradient") {
267 this.setGradientData(value); 271 this.setGradientData(value);
268 } else { 272 } else {