From 1fa8516bcd0fb0277c13a7081b5a51ce041d3496 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 12 Apr 2012 06:24:46 -0700
Subject: Cloud material

---
 js/lib/rdge/texture.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'js/lib/rdge/texture.js')

diff --git a/js/lib/rdge/texture.js b/js/lib/rdge/texture.js
index 569bc364..b85ee076 100644
--- a/js/lib/rdge/texture.js
+++ b/js/lib/rdge/texture.js
@@ -75,16 +75,19 @@ function Texture( dstWorld, texMapName,  wrap, mips )
 		if (srcCanvas)
 		{
 			this._srcCanvas = srcCanvas;
-			if (srcCanvas.elementModel && srcCanvas.elementModel.shapeModel && srcCanvas.elementModel.shapeModel.GLWorld)
+			var srcWorld
+			if (srcCanvas.elementModel && srcCanvas.elementModel.shapeModel  && srcCanvas.elementModel.shapeModel.GLWorld)
+			 srcWorld = srcCanvas.elementModel.shapeModel.GLWorld;
+			if (!srcWorld)  srcWorld = srcCanvas.__GLWorld;
+			if (srcWorld)
 			{
-				this._srcWorld = srcCanvas.elementModel.shapeModel.GLWorld;
+				this._srcWorld = srcWorld;
 
 				// add a notifier to the world
-				this._srcWorld.addListener( this,  this.worldCallback,  { srcWorld: this._srcWorld } );
+				srcWorld.addListener( this,  this.worldCallback,  { srcWorld: this._srcWorld } );
 
 				// check if the source is animated
-				if (srcCanvas.elementModel && srcCanvas.elementModel.shapeModel  && srcCanvas.elementModel.shapeModel.GLWorld)
-					this._isAnimated = this._srcWorld._hasAnimatedMaterials;
+				this._isAnimated = srcWorld._hasAnimatedMaterials;
 			}
 
 			this.loadFromCanvas();
-- 
cgit v1.2.3