浏览代码
Merge branch 'master' into Branch_Batching2
Merge branch 'master' into Branch_Batching2
# Conflicts: # Assets/TestScenes/HDTest/HDRenderLoopTest.unity/Branch_Batching2
Arnaud Carre
7 年前
当前提交
d57fb15d
共有 12 个文件被更改,包括 879 次插入 和 1053 次删除
-
2Assets/ScriptableRenderPipeline/Fptl/LightDefinitions.cs.hlsl
-
5Assets/ScriptableRenderPipeline/HDRenderPipeline/AdditionalData/HDAdditionalLightData.cs
-
64Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/LightDefinition.cs
-
176Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/LightDefinition.cs.hlsl
-
266Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
-
10Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs.hlsl
-
2Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.hlsl
-
43Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePassLoop.hlsl
-
225Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl
-
3Assets/ScriptableRenderPipeline/HDRenderPipeline/Sky/SkyManager.cs
-
732Assets/TestScenes/HDTest/HDRenderLoopTest.unity
-
404Assets/Textures/Batman.png
732
Assets/TestScenes/HDTest/HDRenderLoopTest.unity
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
撰写
预览
正在加载...
取消
保存
Reference in new issue