Merge branch '3d-stable' of https://github.com/cocos-creator/engine into 3d-stable

This commit is contained in:
jerrywwl
2019-03-20 16:18:29 +08:00
@@ -147,8 +147,9 @@ export class SkinningModelComponent extends ModelComponent {
const device = _getGlobalDevice();
const useJointTexture = !__FORCE_USE_UNIFORM_STORAGE__ && device !== null && device.hasFeature(GFXFeature.TEXTURE_FLOAT);
const mat = this.getMaterial(0, CC_EDITOR)!;
const effectAsset = mat.effectAsset;
mat.destroy();
mat.initialize({ defines: { CC_USE_SKINNING: true, CC_USE_JOINTS_TEXTURE: useJointTexture } });
mat.initialize({ effectAsset, defines: { CC_USE_SKINNING: true, CC_USE_JOINTS_TEXTURE: useJointTexture } });
}
private _bindSkeleton () {