浏览代码

Merge branch 'HDRP_GraphicTests' of github.com:Unity-Technologies/ScriptableRenderPipeline into HDRP_GraphicTests

# Conflicts:
#	ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2004_AnimatedCookie.unity.png
#	Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2004_AnimatedCookie.unity
/main
Remy 7 年前
当前提交
59efdea8

比较内容不可用