Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg
# Conflicts: # Assets/01.Scenes/99.Title.unity
This commit is contained in:
commit
d048e1b76b
7940
Assets/01.Scenes/99.Title.unity
Normal file
7940
Assets/01.Scenes/99.Title.unity
Normal file
File diff suppressed because it is too large
Load Diff
@ -40,6 +40,7 @@ Material:
|
||||
disabledShaderPasses:
|
||||
- MOTIONVECTORS
|
||||
- DepthOnly
|
||||
- SHADOWCASTER
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
|
Loading…
Reference in New Issue
Block a user