mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 16:12:40 +08:00
9fd32ee805
# Conflicts: # cocos/core/3d/builtin/effects.ts # cocos/core/director.ts # cocos/core/pipeline/forward/forward-pipeline.ts # cocos/core/pipeline/render-pipeline.ts # cocos/core/pipeline/render-queue.ts # cocos/core/pipeline/render-view.ts # cocos/core/splash-screen-webgl.ts