Remote Texture Loading Fix

Author: man2

cocos2d/core/textures/CCTextureCache.js

@@ -351,16 +351,28 @@ if (cc._renderType === cc._RENDER_TYPE_CANVAS) {
         tex.url = url;
         if (!cc.loader.getRes(url)) {
             if (cc.loader._checkIsImageURL(url)) {
-                cc.loader.load(url, function (err) {
-                    cb && cb.call(target);
+                cc.loader.load(url, function (err, img) {
+					if (err)
+                        return cb ? cb(err) : err;
+						
+					cc.loader.cache[url] = img;
+                    cc.textureCache.handleLoadedTexture(url);
+					
+					var texResult = locTexs[url];
+					
+                    cb && cb.call(target,texResult);
                 });
             } else {
                 cc.loader.loadImg(url, function (err, img) {
                     if (err)
                         return cb ? cb(err) : err;
+						
                     cc.loader.cache[url] = img;
                     cc.textureCache.handleLoadedTexture(url);
-                    cb && cb.call(target, tex);
+					
+					var texResult = locTexs[url];
+					
+                    cb && cb.call(target, texResult);
                 });
             }
         }

cocos2d/core/textures/TexturesWebGL.js

@@ -881,25 +881,35 @@ cc._tmp.WebGLTextureCache = function () {
             cb && cb.call(target, tex);
             return tex;
         }
-
+		
+		
         if (!cc.loader.getRes(url)) {
             if (cc.loader._checkIsImageURL(url)) {
-                cc.loader.load(url, function (err) {
-                    cb && cb.call(target);
+				
+				//cc.log("loading image url");
+                
+				cc.loader.load(url, function (err,img) {
+					cc.loader.cache[url] = img;
+                    cc.textureCache.handleLoadedTexture(url);
+					
+					var texResult = locTexs[url];
+					
+                    cb && cb.call(target,texResult);
                 });
             } else {
                 cc.loader.loadImg(url, function (err, img) {
                     if (err)
                         return cb ? cb(err) : err;
                     cc.loader.cache[url] = img;
                     cc.textureCache.handleLoadedTexture(url);
-                    cb && cb.call(target, tex);
+					
+					var texResult = locTexs[url];
+					
+                    cb && cb.call(target, texResult);
                 });
             }
         }
-
-        tex = locTexs[url] = new cc.Texture2D();
-        tex.url = url;
+		
         return tex;
     };
      _p = null;