Hdrp/combine material samples with shader samples [Skip CI]

com.unity.render-pipelines.high-definition/CHANGELOG.md

@@ -112,6 +112,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added a ray tracing mode option in the HDRP asset that allows to override and shader stripping.
 - Added support for arbitrary resolution scaling of Volumetric Lighting to the Fog volume component.
 - Added range attenuation for box-shaped spotlights.
+- Added scenes for hair and fabric and decals with material samples
+- Added fabric materials and textures
+- Added information for fabric materials in fabric scene
 
 ### Fixed
 - Fix when rescale probe all direction below zero (1219246)
@@ -550,6 +553,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed PBR shader ZTest rendering in deferred.
 - Replaced commands incompatible with async compute in light list build process.
 - Diffusion Profile and Material references in HDRP materials are now correctly exported to unity packages. Note that the diffusion profile or the material references need to be edited once before this can work properly.
+- Fix MaterialBalls having same guid issue
+- Fix spelling and grammatical errors in material samples
 - Fixed unneeded cookie texture allocation for cone stop lights.
 
 ### Changed
@@ -670,6 +675,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Avoid building the mip chain a second time for SSR for transparent objects.
 - Replaced "High Quality" Subsurface Scattering with a set of Quality Levels.
 - Replaced "High Quality" Volumetric Lighting with "Screen Resolution Percentage" and "Volume Slice Count" on the Fog volume component.
+- Merged material samples and shader samples
+- Update material samples scene visuals
 
 ## [7.1.1] - 2019-09-05
 

com.unity.render-pipelines.high-definition/Documentation~/HDRP-Sample-Content.md

@@ -18,16 +18,6 @@ Additional Post-Processing Data gives you access to Textures you can use with po
 - Spectral Look-up Textures (designed for use in [Chromatic Aberrations](Post-Processing-Chromatic-Aberration.html)).
 - Look-Up Textures.
 
-## Shader Graph Samples
-
-This Sample includes example Shader Graphs that show you how to use the following Master Nodes: 
-
-* [Fabric Master Node](Master-Node-Fabric.html).
-* [Hair Master Node](Master-Node-Hair.html).
-* [Decal Master Node](Master-Node-Decal.html).
-
-The Fabric and Hair Master Nodes usually require various work from artists inside the Shader Graph and the Samples are a good head start.
-
 ## Procedural Sky
 
 The [Procedural Sky](Override-Procedural-Sky.html) is a deprecated sky type from older versions of HDRP which you can use for compatibility. This Sample also includes an example of how to create a custom sky in your Project that is compatible with HDRP's [Volume framework](Volumes.html). HDRP will remove the Procedural Sky in a future version because it behaves incorrectly with HDRP's physically based light units.
@@ -40,5 +30,5 @@ This Sample includes various examples of lit and unlit particle effects.
 
 ![Material Samples](Images/MaterialSamples.png)
 
-This Sample includes various examples of Materials that use the [Lit Shader](Lit-Shader.html). The included Materials use effects such as subsurface scattering, displacement, and anisotropy. The **MaterialSamples** Scene requires Text Mesh Pro to display the text explanations.
-
+This Sample includes various examples of Materials. It includes Materials that use the [Lit Shader](Lit-Shader.html), [Fabric Master Node](Master-Node-Fabric.html), [Hair Master Node](Master-Node-Hair.html), and [Decal Master Node](Master-Node-Decal.html). The included Materials use effects such as subsurface scattering, displacement, and anisotropy. The **MaterialSamples** Scene requires Text Mesh Pro to display the text explanations.
+The Fabric and Hair Master Nodes usually require various work from artists inside the Shader Graph and the Samples are a good head start.