Merge branch 'master' of github.com:Motorola-Mobility/ninja

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 ) {
         var material = this._materialNode;
         if (material)  technique = material.shaderProgram[this.getTechniqueName()];
 
+        // make sure RDGE has the correct context
+        if (this.getWorld())
+            RDGE.globals.engine.setContext( this.getWorld().getCanvas().rdgeid );
+
         if(prop === "gradient") {
             this.setGradientData(value);
         } else {