mirror of
https://github.com/cocos/cocos-engine.git
synced 2026-09-07 00:02:53 +08:00
1446db89e7
# Conflicts: # cocos/2d/components/sprite.ts # cocos/2d/framework/ui-transform.ts # cocos/2d/renderer/render-uniform-buffer.ts # cocos/core/builtin/effects.ts # cocos/core/builtin/shader-sources/glsl1.ts # cocos/core/builtin/shader-sources/glsl3.ts # cocos/core/builtin/shader-sources/glsl4.ts # cocos/dragon-bones/ArmatureDisplay.ts # cocos/spine/skeleton.ts # editor/assets/chunks/cc-sprite-fs-gpu.chunk # editor/assets/chunks/cc-sprite-fs-gpu.chunk.meta # editor/assets/chunks/cc-sprite-vs-gpu.chunk # editor/assets/chunks/cc-sprite-vs-gpu.chunk.meta # editor/assets/default_skybox.meta # editor/assets/effects/builtin-sprite-gpu.effect.meta