minggo 5663b38e33 Merge branch 'v3.8.2' into develop-merge-v3.8.2 ...

Conflicts:
	cocos/3d/assets/mesh.ts
	editor/inspector/contributions/node.js
	editor/inspector/utils/prop.js
	native/cocos/3d/assets/Mesh.h
	native/cocos/engine/Engine.cpp
	native/cocos/renderer/gfx-gles3/GLES3Commands.cpp
	native/cocos/renderer/pipeline/custom/NativePipeline.cpp
	native/external-config.json

2023-08-31 14:41:18 +08:00

36 KiB

Raw Permalink Blame History

View Raw