Skip to content

Commit e9214c3

Browse files
authored
Merge pull request #9 from gam0022/unity/update-to-2018.2.0f2
Unity/update to 2018.2.0f2
2 parents 5d9fccb + 656d1d3 commit e9214c3

File tree

437 files changed

+556
-61307
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

437 files changed

+556
-61307
lines changed

.idea/.idea.unity-demoscene/.idea/contentModel.xml

Lines changed: 2 additions & 210 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Demoscene/Projects/2018-05-28-Sandwich/uRaymarchingShaders/WorldSandwich.mat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_PrefabParentObject: {fileID: 0}
7+
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: WorldSandwich
1010
m_Shader: {fileID: 4800000, guid: cb3594e638cfb1940815ad9e2ebc20c4, type: 3}
@@ -20,7 +20,7 @@ Material:
2020
m_TexEnvs: []
2121
m_Floats:
2222
- _Glossiness: 0.5
23-
- _LocalTime: 1.9688673
23+
- _LocalTime: 0
2424
- _Loop: 100
2525
- _Metallic: 0.5
2626
- _MinDistance: 0.01

0 commit comments

Comments
 (0)