Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix

cocos/renderer/CCTextureCache.cpp

@@ -268,7 +268,11 @@ void TextureCache::addImageAsyncCallBack(float dt)
                 texture = it->second;
         }
         
-        asyncStruct->callback(texture);
+        if (asyncStruct->callback)
+        {
+            asyncStruct->callback(texture);
+        }
+        
         if(image)
         {
             image->release();

cocos/ui/GUIDefine.h

@@ -25,7 +25,6 @@
 #ifndef __TestCpp__GUIDefine__
 #define __TestCpp__GUIDefine__
 
-#include "cocos2d.h"
 #include <string>
 #include "cocostudio/ObjectFactory.h"
 

cocos/ui/UIHelper.cpp

@@ -22,7 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ****************************************************************************/
 
-#include "CocosGUI.h"
+#include "ui/UIHelper.h"
+#include "ui/UIWidget.h"
 
 NS_CC_BEGIN
 

cocos/ui/UIHelper.h

@@ -25,9 +25,14 @@ THE SOFTWARE.
 #ifndef __UIHELPER_H__
 #define __UIHELPER_H__
 
+#include <string>
+#include "base/CCPlatformMacros.h"
+
 NS_CC_BEGIN
 
 namespace ui {
+    
+    class Widget;
 
 /**
 *   @js NA