Reimporting materials to fix conflicting guids

5 年前 · 67b4d713
--- a/Assets/Materials/JointLineMaterial.mat.meta
+++ b/Assets/Materials/JointLineMaterial.mat.meta
 fileFormatVersion: 2
-guid: 1d85e66239f5b41eb87246c413157610
+guid: 7c57bb7614d2746e4a2cc322b1174d39
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 2100000
--- a/Assets/Materials/XMaterial.mat.meta
+++ b/Assets/Materials/XMaterial.mat.meta
 fileFormatVersion: 2
-guid: 1d85e66239f5b41eb87246c413157610
+guid: f7bf7884e65c546bb89d4e3e0aef2ae9
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 2100000