mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
1d2a82d957
# Conflicts: # cocos/core/3d/framework/mesh-renderer.ts # cocos/core/components/ui-base/ui-renderable.ts # cocos/core/pipeline/forward/forward-pipeline.ts # cocos/core/pipeline/forward/scene-culling.ts # cocos/core/pipeline/render-additive-light-queue.ts # cocos/core/pipeline/render-stage.ts # cocos/core/pipeline/shadow/shadow-flow.ts # cocos/core/renderer/core/memory-pools.ts # cocos/core/renderer/scene/camera.ts # cocos/core/renderer/scene/model.ts # cocos/core/renderer/scene/render-scene.ts # cocos/core/root.ts # cocos/particle/billboard.ts # cocos/terrain/terrain.ts # cocos/ui/components/button.ts # package-lock.json # package.json # tests/general/sealed-global-variables.json