[engine] 多纹理渲染、动态图集调整开关时主动刷新渲染状态

engine/cocos2d/core/components/CCLabel.js

@@ -586,15 +586,24 @@ let Label = cc.Class({
         autoSwitchMaterial: {
             type: RenderComponent.EnableType,
             default: RenderComponent.EnableType.GLOBAL,
+            notify(oldValue) {
+                if (this.autoSwitchMaterial === oldValue) return;
+                this.setVertsDirty();
+            },
         },
         allowDynamicAtlas: {
             type: RenderComponent.EnableType,
             default: RenderComponent.EnableType.GLOBAL,
+            notify(oldValue) {
+                if (this.allowDynamicAtlas === oldValue) return;
+                this.setVertsDirty();
+            },
         },
         enableRetina: {
             type: RenderComponent.EnableType,
             default: RenderComponent.EnableType.GLOBAL,
             notify(oldValue) {
+                if (this.enableRetina === oldValue) return;
                 this.setVertsDirty();
             }
         },

engine/cocos2d/core/components/CCMotionStreak.js

@@ -219,8 +219,20 @@ var MotionStreak = cc.Class({
         autoSwitchMaterial: {
             type: RenderComponent.EnableType,
             default: RenderComponent.EnableType.GLOBAL,
+            notify(oldValue) {
+                if (this.autoSwitchMaterial === oldValue) return;
+                this.setVertsDirty();
             },
         },
+    },
+
+    setVertsDirty() {
+        // 自动切换材质
+        this._checkSwitchMaterial();
+
+        this._updateMaterial();
+        this._super();
+    },
 
     __preload() {
         this._super();

engine/cocos2d/core/components/CCSprite.js

@@ -391,10 +391,18 @@ var Sprite = cc.Class({
         autoSwitchMaterial: {
             type: RenderComponent.EnableType,
             default: RenderComponent.EnableType.GLOBAL,
+            notify(oldValue) {
+                if (this.autoSwitchMaterial === oldValue) return;
+                this.setVertsDirty();
+            },
         },
         allowDynamicAtlas: {
             type: RenderComponent.EnableType,
             default: RenderComponent.EnableType.GLOBAL,
+            notify(oldValue) {
+                if (this.allowDynamicAtlas === oldValue) return;
+                this.setVertsDirty();
+            },
         },
     },
 

engine/extensions/spine/Skeleton.js

@@ -435,10 +435,18 @@ sp.Skeleton = cc.Class({
         autoSwitchMaterial: {
             type: RenderComponent.EnableType,
             default: RenderComponent.EnableType.GLOBAL,
+            notify(oldValue) {
+                if (this.autoSwitchMaterial === oldValue) return;
+                this.setVertsDirty();
+            },
         },
         allowDynamicAtlas: {
             type: RenderComponent.EnableType,
             default: RenderComponent.EnableType.GLOBAL,
+            notify(oldValue) {
+                if (this.allowDynamicAtlas === oldValue) return;
+                this.setVertsDirty();
+            },
         },
     },
 
@@ -458,6 +466,13 @@ sp.Skeleton = cc.Class({
         this._dataDirty = true;
     },
 
+    setVertsDirty() {
+        this._dataDirty = true;
+        this.invalidAnimationCache();
+        this._materialCache = {};
+        this._super();
+    },
+
     // override base class _getDefaultMaterial to modify default material
     _getDefaultMaterial () {
         return cc.Material.getBuiltinMaterial('2d-spine');
@@ -1010,8 +1025,7 @@ sp.Skeleton = cc.Class({
                 attachment.setRegion(region);
                 attachment.updateOffset();
             }
-            this._dataDirty = true;
+            this.setVertsDirty();
-            this.invalidAnimationCache();
             return true;
         }
         return false;