From 5cb46cee5d4f90046ffc4e2851ae3465366c3a8e Mon Sep 17 00:00:00 2001 From: "zhefeng.zhang" <35944775+zhefengzhang@users.noreply.github.com> Date: Fri, 12 Sep 2025 17:09:51 +0800 Subject: [PATCH] Use a better approach to address the issue in PR #18052, while fixing the problem where material cannot be read in the onEnable callback. (#18976) --- cocos/2d/components/label.ts | 2 +- cocos/2d/framework/ui-renderer.ts | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cocos/2d/components/label.ts b/cocos/2d/components/label.ts index 7f33e79441..a560b10beb 100644 --- a/cocos/2d/components/label.ts +++ b/cocos/2d/components/label.ts @@ -1027,7 +1027,7 @@ export class Label extends UIRenderer { if (!this.renderData) { if (this._assembler && this._assembler.createData) { this._renderData = this._assembler.createData(this) as RenderData; - this.renderData!.material = this.material; + this.renderData!.material = this.getRenderMaterial(0); this._updateColor(); } } diff --git a/cocos/2d/framework/ui-renderer.ts b/cocos/2d/framework/ui-renderer.ts index 82c14fefae..c10850c5c9 100644 --- a/cocos/2d/framework/ui-renderer.ts +++ b/cocos/2d/framework/ui-renderer.ts @@ -398,9 +398,7 @@ export class UIRenderer extends Renderer { this.node.off(NodeEventType.ANCHOR_CHANGED, this._nodeStateChange, this); this.node.off(NodeEventType.SIZE_CHANGED, this._nodeStateChange, this); this.node.off(NodeEventType.PARENT_CHANGED, this._colorDirty, this); - // When disabling, it is necessary to free up idle space to fully utilize chunks - // and avoid breaking batch processing. - this._destroyData(); + this.destroyRenderData(); uiRendererManager.removeRenderer(this); this._renderFlag = false; this._renderEntity.enabled = false;