sebastienlagarde
314924b2
HDRenderPipeline: Fix issue with SSS + add test scene
8 年前
Sebastien Lagarde
58f36f39
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl
8 年前
Sebastien Lagarde
ad3ed427
HDRenderPipeline: Adding missing files / meta / directory
8 年前
sebastienlagarde
ef19678b
HDRenderPipeline: Submit missing meta and mat file.
8 年前
sebastienlagarde
0ded8f98
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows
# Conflicts:
# Assets/TestScenes/HDTest/GraphicTest/SSS/head.OBJ.meta
8 年前
GitHub
712ff1d3
Merge pull request #228 from Unity-Technologies/shadows
Update Shadows system
8 年前
Evgenii Golubev
273792fc
Update material IDs of the HD test scene
8 年前
GitHub
13ca3e1b
Merge pull request #252 from EvgeniiG/material_id_update
Update the HD test scene
8 年前
Evgenii Golubev
0d763678
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
sebastienlagarde
46417646
HDRednerPipeline: Update transmission test + clean code
- Rename Thin Material in Thin objects
- Merge enable transmission and enable thin material in transmission
type
- re-add human head
- fix thin transmission test scene
8 年前
GitHub
c7298a02
Merge pull request #254 from Unity-Technologies/Ad-thin-material-flags
HDRenderPipeline: Add thin material option + Fix issue with transmission and shadow
8 年前
GitHub
fff7894f
Merge branch 'master' into submodule-fix
8 年前
sebastienlagarde
e82137bb
HDRenderPipeline: Fix SSS test
8 年前
GitHub
a1884724
Merge pull request #279 from Unity-Technologies/Object-space-normal-improvement
Object space normal improvement
8 年前
Evgenii Golubev
ad3d47b5
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Filip Iliescu
dda281fd
Merge branch 'master' into classicDeferredMobile
8 年前
David Rogers
85744e59
Local merge
8 年前
David Rogers
36baac01
Revert "Local merge"
This reverts commit 05f9d2b94ae1d3a5f3e707ba4ad677e700a6fc55, reversing
changes made to f491bb59591c78736427ca92d2067f445f1630c5.
8 年前
Filip Iliescu
9c290707
merge changes from remote to local branch
8 年前
Evgenii Golubev
d238793c
Add the old SSS model back
8 年前
GitHub
2e5e9470
Merge pull request #294 from EvgeniiG/upstream
Add the old SSS model back
8 年前
Sebastien Lagarde
0373fa24
HDRenderPipeline: Add reference mode for SSS
8 年前
Evgenii Golubev
e996e9cd
Update the SSS profile used for the head
8 年前
Evgenii Golubev
4b7caf6a
Merge branch 'upstream/Update-SSS' into upstream (without the reference mode)
8 年前
GitHub
17c2ab06
Merge pull request #297 from EvgeniiG/upstream
Merge branch 'upstream/Update-SSS' into upstream (without the reference mode)
8 年前
Arnaud Carre
d070d1b8
Merge branch 'master' into Branch_Batching2
8 年前
Evgenii Golubev
0a7924ff
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into hdrp_matrix
8 年前
Filip Iliescu
74f56073
create new branch from stable place of classicDeferredMobile and cherry pick all previous commits since history got corrupted somewhere
8 年前
Sebastien Lagarde
1ed5cfbe
HDRenderPipeline: Update all material in test scene
8 年前
GitHub
2b47951c
Merge pull request #314 from Unity-Technologies/Move-matId-Specular-in-Standard
Update materialId management in Lit (Optimization + one slot saved)
8 年前
Evgenii Golubev
5570c647
Merge branch 'master'
8 年前
Filip Iliescu
cd024be6
Merge branch 'master' into OnTileDeferred
8 年前
Arnaud Carre
b7e36e2f
Merge branch 'master' into Branch_Batching2
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderVariablesFunctions.hlsl.meta
# Assets/TestScenes/HDTest/HDRenderLoopTest.meta
# Assets/TestScenes/HDTest/NewBatcherTest/skin.meta
8 年前
Evgenii Golubev
f3d8504d
Add the SSS profiling scene
7 年前
GitHub
f92ef9c5
Merge pull request #342 from EvgeniiG/opt_sss
Port SSS to compute with an LDS texture cache
7 年前
Rune Stubbe
5f1e866a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Arnaud Carre
ad0fb3d8
Merge branch 'master' into Branch_Batching2
7 年前
Filip Iliescu
28a25cc0
merged master
7 年前
sebastienlagarde
90dcb63d
HDRenderPipeline: Update test scene with clear coat test
7 年前
GitHub
e47845fe
Merge pull request #370 from Unity-Technologies/Add-clear-coat
Add clear coat support
7 年前
Evgenii Golubev
a449e3ad
Merge branch 'master' (area light clear coat code is disabled for now)
7 年前
Julien Ignace
39c4d3b5
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RenameLayeredShader
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Editor/LitUI.cs
7 年前
Felipe Lira
7d62ca8f
Merge branch 'master' into LightweightPipeline
# Conflicts:
# Assets/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightPipeline.shader
7 年前
Invertex
347e3a06
SSS: Added thickness map and adjusted settings for Perry head example
7 年前
GitHub
63209502
Merge pull request #419 from Invertex/2017.3-Invertex
SSS: Added thickness map and adjusted settings for Perry head example
7 年前
GitHub
a82f6ffc
Merge pull request #421 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Evgenii Golubev
8a5090cc
Reassign the thickness map (outdated GUID)
7 年前
GitHub
3151b43b
Merge pull request #423 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Julien Ignace
825bfd84
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DepthPrepass
7 年前
Peter Andreasen
867c8236
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Julien Ignace
674d0efe
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into culling
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
Frédéric Vauchelles
9c88dfd3
Updated keywords of materials
7 年前
GitHub
4d41fcaa
Merge pull request #496 from Unity-Technologies/feature/transparentPrepass
Feature/transparent prepass
7 年前
sebastienlagarde
522098e8
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3
7 年前
Julien Ignace
1e8876bf
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_FogAndProceduralSky
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/BaseUnlitUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/ShaderPassForwardUnlit.hlsl
7 年前
sebastienlagarde
60296408
HDRenderPipeline: Update all material Keywords
7 年前
Evgenii Golubev
733171ce
Merge branch 'Unity-2017.3'
7 年前
GitHub
bd071d2c
Merge pull request #515 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Robert Srinivasiah
7998bfa7
Merge remote-tracking branch 'origin/master' into xr-hdrp
7 年前
Felipe Lira
6ddf3f73
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
Sebastien Lagarde
a4fddf9c
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
Sebastien Lagarde
69c9baac
HDRenderPipeline: Fix test scene
7 年前
GitHub
ae2a6ad0
Merge pull request #551 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
sebastienlagarde
a1929730
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/Character.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/ComplexMaterial/Textures.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/0xxx.meta
7 年前
Julien Ignace
11c1d9a8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
7 年前
Julien Ignace
220e0aff
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
7 年前
Peter Andreasen
f052451a
merged from master
7 年前
Felipe Lira
e4ffdd2d
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
Paul Melamed
d31d3ab4
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into prototype/decals
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
7 年前
sebastienlagarde
2c9bfb4e
HDRenderPipeline: fix all material in current project
7 年前
GitHub
fc5778fa
Merge pull request #655 from Unity-Technologies/Fix-all-material-in-project
HDRenderPipeline: fix all material in current project
7 年前
sebastienlagarde
04b2dec6
Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals
7 年前
Julien Ignace
1ce75e59
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
Evgenii Golubev
7106bb0a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
Raymond Graham
1118c956
Merge branch 'master' into motionVectorSupport
7 年前
Felipe Lira
ddeb54b6
Merge branch 'master' into LightweightPipeline
7 年前
sebastienlagarde
2b24ec8c
Update all material
7 年前
GitHub
7ab47949
Merge pull request #696 from Unity-Technologies/add-versionning-on-additonal-data
Add versionning on additonal data
7 年前
Frédéric Vauchelles
ac97e406
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
Paul Melamed
db6f48d8
Merge branch 'master' into prototype/decals
# Conflicts:
# ScriptableRenderPipeline/Core/Editor/ShaderGenerator/CSharpToHLSL.cs
# ScriptableRenderPipeline/Core/Resources/EncodeBC6H.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalData.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalProperties.hlsl
7 年前
Evgenii Golubev
2e30e761
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
Peter Andreasen
87c36d52
merged with master
7 年前
Robert Srinivasiah
0c9c55a9
Merge in master, with lots of fixups
Git hates merges + moves/renames.
Main problems have to do with FrameSettings management, and shifting of stuff into the more responsible SubsurfaceScatteringManager
7 年前
Remy
ca0020dd
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/CommonSettings.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/HDRP_Test_Camera.prefab
7 年前
Felipe Lira
c6543428
Merge branch 'master' into LightweightPipeline
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Textures/ConvertedSubstances.meta
# Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Textures/ConvertedSubstances/Challenge-Brick.meta
7 年前
Mike Wuetherick
767eac9b
Merge branch 'LightweightPipeline' into projects/TheLastStand
7 年前
Sebastien Lagarde
a8ab890d
Rename SubsurfaceScattering Settings/Editor to DiffusionProfile + various file renaming/moving
7 年前
GitHub
76304378
Merge pull request #758 from Unity-Technologies/Rename-Subsurface-Profile-=---Diffusion--profile
Update Subsurface profile
7 年前
Sebastien Lagarde
e059a00a
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-GBuffer-with-material-feature
7 年前
Julien Ignace
05efe29c
Updated Heightmap parametrization and converted all HDRP materials.
7 年前
Evgenii Golubev
7e74580b
Merge branch 'master'
7 年前
Evgenii Golubev
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
sebastienlagarde
2fd0a788
HDRenderPipeline: Update all materials
7 年前
GitHub
fbce26f6
Merge pull request #770 from Unity-Technologies/update-all-materials
HDRenderPipeline: Update all materials
7 年前
Frédéric Vauchelles
790cee43
Merge branch 'master' into feature/PlanarReflection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
7 年前
Sebastien Lagarde
f97342c5
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
lyndon homewood
ef4b0aa9
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
7 年前
Julien Ignace
43f6d6eb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_HeightMapParametrization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/Lit/BaseLitUI.cs
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Checker_Planar.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Checker_Triplanar.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Green_CheckerAlphaCutout.mat
7 年前
GitHub
544aba56
Merge pull request #777 from Unity-Technologies/Branch_HeightMapParametrization
Updated Heightmap parametrization and converted all HDRP materials.
7 年前
Thomas
4b33a1b6
Merge branch 'master' into lw-gc-optim
7 年前
Julien Ignace
6ba9292e
Revered matrerial update after heightmap parametrization change.
7 年前
Julien Ignace
cdd44d73
Re-updated materials with new heightmap parametrization
7 年前
sebastienlagarde
7f5f1c1a
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
GitHub
37a266ac
Merge pull request #788 from Unity-Technologies/Branch_FixHeightMapUpdate
Branch fix height map update
7 年前
sebastienlagarde
01b7d081
HDRenderPipeline: Update all materils keyword in scene and project
7 年前
Raymond Graham
d1c64b56
Merge branch 'master' into gpuInstancingSupport
7 年前
Julien Ignace
4919b7ad
Merge branch 'master' into Branch_ScreenSpaceShadows
# Conflicts:
# ScriptableRenderPipeline/Core/ShaderLibrary/Random.hlsl
# ScriptableRenderPipeline/Core/Shadow/AdditionalShadowData.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDStringConstants.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/Editor/HDLightEditor.Styles.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/Editor/HDLightEditor.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/DeferredDirectionalShadow.compute
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
# ScriptableRenderPipeline/HDRenderPipeline/ShaderVariablesFunctions.hlsl
7 年前
Evgenii Golubev
77f9f167
Merge branch 'master'
7 年前
Peter Andreasen
3ccf74cc
merged from master
7 年前
Arnaud Carre
4bef6509
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Remy
3b815534
Merge commit 'ccee1ef8a8d0611355aaeace2c3530b65e34dfe0' into FixFix_TestFrameworkTools
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3002_ObjectMotionVector.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3003_CameraMotionVector_TranslateX.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3004_CameraMotionVector_TranslateY.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3005_CameraMotionVector_TranslateZ.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3006_CameraMotionVector_RotateX.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3007_CameraMotionVector_RotateY.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3008_CameraMotionVector_RotateZ.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3009_CameraMotionVector_FOV.unity.png
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/3xxx_DebugView/3002_ObjectMotionVector/SinMove.cs
# Te...
7 年前
Evgenii Golubev
7d2031ec
Merge branch 'master'
7 年前
Paul Melamed
6deb71dc
Merge branch 'master' into prototype/decals_drawinstance
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderVariables.hlsl
7 年前
Frédéric Vauchelles
86df6636
Merge master
7 年前
Sebastien Lagarde
5f384459
HDRenderPipeline: Update all materials
7 年前
Remy
afb74a48
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Sebastien Lagarde
5705de92
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Paul Melamed
c5fce3e3
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Frédéric Vauchelles
ca10cd2f
Merge
7 年前
Felipe Lira
c51ce48c
Merged master
7 年前
John
dea94b9d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
John
cf25c602
Merge master
7 年前
Peter Andreasen
8b8ef607
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
sebastienlagarde
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
Sebastien Lagarde
a28733e8
HDRenderPipeline: Update all materials
7 年前
Remy
2136ed15
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Tim Cooper
803d7f40
Merge remote-tracking branch 'origin/master' into LW-ScreenSpaceShadows-KeywordsReduction
7 年前
John
89a55fab
Merge branch 'LW-ScreenSpaceShadows-KeywordsReduction' into LW-ScreenSpaceShadows
7 年前
John
0bfdddfc
Merge Screen Shadows
7 年前
Julien Ignace
950b560d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreUtils.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipelineAsset.asset
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs
7 年前
sebastienlagarde
83b753ad
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Frédéric Vauchelles
672c909b
Merge branch 'master' into feature/ScreenSpaceProjection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/SceneViewDrawMode.cs.meta
# Tests/Scripts/Editor/GraphicTests/Framework/TestResultWindow.cs.meta
7 年前
Sebastien Lagarde
eca15a2d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
7 年前
sebastienlagarde
046a77ef
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Sebastien Lagarde
106566dc
Update the UI for iridescence
7 年前
Mike Wuetherick
0d5b90fd
updated mats for 2018.1.0b6
7 年前
John
360fd4d8
Merge branch 'projects/TheLastStand' into projects/TheLastStand-SubsurfaceScattering
7 年前
sebastienlagarde
5f14b489
Update all materials with Last PR
7 年前
GitHub
ce027b15
Merge pull request #947 from Unity-Technologies/Improve-forward-opaque-pass
Update all material for PR 946
7 年前
sebastienlagarde
44c4a197
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
7 年前
Evgenii Golubev
e768893e
Merge branch 'master'
7 年前
GitHub
f618fcd9
Merge pull request #944 from Unity-Technologies/support-iridescence
Add support for Iridescence in Lit
7 年前
Remy
d56ea57d
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Robert Srinivasiah
a3ddcd05
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
sebastienlagarde
2c61701c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Peter Andreasen
04b933d9
merged with master
7 年前
Paul Melamed
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前