Merge branch 'main' of http://212.24.110.183:3000/IPSEITY/Unheimlich_POC
# Conflicts: # Assets/Scripts/Editor/FBXImporter/processed_fbx.txt # Assets/Unheimlich_POC/Content/Environment/Visual Demo (for everyone)/Rooms/PlayGround/Sources/SpiralStairs.fbx
This commit is contained in:
@@ -1,14 +1,9 @@
|
||||
fileFormatVersion: 2
|
||||
guid: df955fddcea22c44ba108674c3613cf5
|
||||
guid: beb7149d0c9a97245aa4abfb393c7069
|
||||
ModelImporter:
|
||||
serializedVersion: 24200
|
||||
internalIDToNameTable: []
|
||||
externalObjects:
|
||||
- first:
|
||||
type: UnityEngine:Material
|
||||
assembly: UnityEngine.CoreModule
|
||||
name: standardSurface1
|
||||
second: {fileID: 2100000, guid: c5d5526dd66d2c74099723ddbc2c158c, type: 2}
|
||||
externalObjects: {}
|
||||
materials:
|
||||
materialImportMode: 2
|
||||
materialName: 1
|
||||
|
||||
Reference in New Issue
Block a user