to master merge

2022-05-02 16:09:20 +03:00
parent 6571056d18
commit 2beb3298c6
10 changed files with 138 additions and 117 deletions
--- a/Support/Materials/Foliage/URP_Grass.mat
+++ b/Support/Materials/Foliage/URP_Grass.mat
@@ -1,18 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1458936301379465483
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 5
 --- !u!21 &2100000
 Material:
  serializedVersion: 6
@@ -135,3 +122,16 @@ Material:
    - _WavingTint: {r: 1, g: 1, b: 1, a: 1}
    - _Wind: {r: 1, g: 1, b: 4, a: 8}
  m_BuildTextureStacks: []
+--- !u!114 &132002584372362984
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 5
--- a/Support/Materials/Foliage/URP_GrassInteractive.mat
+++ b/Support/Materials/Foliage/URP_GrassInteractive.mat
@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8850970943120936482
+--- !u!114 &-6731343359379762165
 MonoBehaviour:
  m_ObjectHideFlags: 11
  m_CorrespondingSourceObject: {fileID: 0}
--- a/Support/Materials/Foliage/URP_TreeBillboard.mat
+++ b/Support/Materials/Foliage/URP_TreeBillboard.mat
@@ -82,7 +82,7 @@ Material:
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
  m_BuildTextureStacks: []
--- !u!114 &7435650071506671124
+--- !u!114 &2766792793257514549
 MonoBehaviour:
  m_ObjectHideFlags: 11
  m_CorrespondingSourceObject: {fileID: 0}