浏览代码

Merge pull request #1 from unity/fix_sample

Reimporting materials to fix conflicting guids
/3.1
GitHub Enterprise 6 年前
当前提交
faa62d15
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 2
      Assets/Materials/JointLineMaterial.mat.meta
  2. 2
      Assets/Prefabs/JointLineRenderer.prefab

2
Assets/Materials/JointLineMaterial.mat.meta


fileFormatVersion: 2
guid: 1d85e66239f5b41eb87246c413157610
guid: 7c57bb7614d2746e4a2cc322b1174d39
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

2
Assets/Prefabs/JointLineRenderer.prefab


m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 1d85e66239f5b41eb87246c413157610, type: 2}
- {fileID: 2100000, guid: 7c57bb7614d2746e4a2cc322b1174d39, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0

正在加载...
取消
保存