浏览代码

Merge branch 'master' into feature/SSR

# Conflicts:
#	com.unity.render-pipelines.high-definition/HDRP/HDRenderPipeline.cs
/main
Frédéric Vauchelles 6 年前
当前提交
d7e670a6
共有 2 个文件被更改,包括 0 次插入8 次删除
  1. 8
      .gitmodules

8
.gitmodules


path = PostProcessing
url = https://github.com/Unity-Technologies/PostProcessing
branch = v2
[submodule "Tests/UTF_Core"]
path = TestProjects/GraphicsTests/Assets/Tests/UTF_Core
url = https://github.com/Unity-Technologies/UTF_Core.git
branch = master
[submodule "Tests/UTF_Tests_HDRP"]
path = TestProjects/GraphicsTests/Assets/Tests/UTF_Tests_HDRP
url = https://github.com/Unity-Technologies/UTF_Tests_HDRP.git
branch = master
[submodule "TestProjects/GraphicsTests/Assets/Tests/UTF_Core"]
path = TestProjects/GraphicsTests/Assets/Tests/UTF_Core
url = https://github.com/Unity-Technologies/UTF_Core.git

正在加载...
取消
保存