Merge pull request cocos#24 from sunnylanwanjun/v2.3.0-fix-skeleton-m…

…aterial-bug Dragonbones and Spine Material bug
caryliu1999 · Jul 2, 2019 · 97a96fe · 97a96fe
2 parents ee71903 + 1b9e8e0
commit 97a96fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/extensions/dragonbones/ArmatureDisplay.js b/extensions/dragonbones/ArmatureDisplay.js
@@ -411,7 +411,7 @@ let ArmatureDisplay = cc.Class({
     },
 
     _updateBatch () {
-        let baseMaterial = this.sharedMaterials[0];
+        let baseMaterial = this.getMaterial(0);
         if (baseMaterial) {
             baseMaterial.define('CC_USE_MODEL', !this.enableBatch);
         }

diff --git a/extensions/spine/Skeleton.js b/extensions/spine/Skeleton.js
@@ -443,7 +443,7 @@ sp.Skeleton = cc.Class({
     },
 
     _updateUseTint () {
-        let baseMaterial = this.sharedMaterials[0];
+        let baseMaterial = this.getMaterial(0);
         if (baseMaterial) {
             baseMaterial.define('USE_TINT', this.useTint);
         }
@@ -457,7 +457,7 @@ sp.Skeleton = cc.Class({
     },
 
     _updateBatch () {
-        let baseMaterial = this.sharedMaterials[0];
+        let baseMaterial = this.getMaterial(0);
         if (baseMaterial) {
             baseMaterial.define('CC_USE_MODEL', !this.enableBatch);
         }