Merge pull request #3503 from pandamicro/develop

Add ENABLE_IMAEG_POOL setting

Author: pandamicro

CCBoot.js

@@ -82,6 +82,8 @@ cc._canvas = null;
 cc.container = null;
 cc._gameDiv = null;
 
+window.ENABLE_IMAEG_POOL = true;
+
 /**
  * Iterate over an object or an array, executing a function for each matched element.
  * @param {object|array} obj
@@ -938,7 +940,7 @@ cc.loader = (function () {
                     delete _queue[url];
                 }
 
-                if (cc._renderType === cc.game.RENDER_TYPE_WEBGL) {
+                if (ENABLE_IMAEG_POOL && cc._renderType === cc.game.RENDER_TYPE_WEBGL) {
                     imagePool.put(img);
                 }
             };

cocos2d/core/textures/TexturesWebGL.js

@@ -496,7 +496,9 @@ cc._tmp.WebGLTexture2D = function () {
 
             self._hasPremultipliedAlpha = premultiplied;
             self._hasMipmaps = false;
-            self._htmlElementObj = null;
+            if (ENABLE_IMAEG_POOL) {
+                self._htmlElementObj = null;
+            }
 
             //dispatch load event to listener.
             self.dispatchEvent("load");