Merge branch 'art-assets' of github.com:UnityTechnologies/open-project-1 into art-assets

# Conflicts:
#	UOP1_Project/Assets/Materials/Water.mat.meta
#	UOP1_Project/Assets/Scenes/ArtShowcase.meta
#	UOP1_Project/Assets/Scenes/ArtShowcase.unity
#	UOP1_Project/Assets/Shaders/ToonWater.meta

UOP1_Project/Assets/Shaders/ToonWater.meta

+fileFormatVersion: 2
+guid: 6f71c375e0843bc4fa4f3340c16ad2c1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UOP1_Project/Assets/Shaders/ToonWater/CartoonWater.mat

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: CartoonWater
+  m_Shader: {fileID: -6465566751694194690, guid: 645ecdab619ec8747bd9e32c7cb90196,
+    type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs: []
+    m_Floats:
+    - Vector1_111BDCE3: 5
+    - Vector1_2402C92B: 0.35
+    - Vector1_4AA7864F: 1
+    - Vector1_87D2A26: 3
+    - Vector1_8E7602E9: 0.8
+    - Vector1_B7E59C0B: 0.1
+    - Vector1_C32CC451: 0.7
+    - Vector1_EB584745: 15
+    m_Colors:
+    - Color_42D50580: {r: 0, g: 0.7082206, b: 0.90588236, a: 0}
+    - Color_B067A587: {r: 0.6632792, g: 1.4401618, b: 1.9804953, a: 0}

UOP1_Project/Assets/Shaders/ToonWater/CartoonWater.mat.meta

+fileFormatVersion: 2
+guid: e0c2648648350bf43bf3e55529cc5f4a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UOP1_Project/Assets/Shaders/ToonWater/CartoonWater.shadergraph.meta

+fileFormatVersion: 2
+guid: 23e303e7e95c2a04487f4cb82426a224
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}