Skip to content

Commit fa3737a

Browse files
natalielhnatalielh
authored
Merge pull request #7 from natalielh/nodefunc02
Nodefunc02
2 parents 69b6863 + 407e99b commit fa3737a

File tree

168 files changed

+69709
-28527
lines changed

Some content is hidden

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

168 files changed

+69709
-28527
lines changed

‎unityproj_spatialflowvis/Assets/Buildings/Materials/No Name.mat‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: No Name
10-
m_Shader: {fileID: 4800000, guid: a956924bd6a8ae44ca741bc69e575fe3, type: 3}
11+
m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
1112
m_ShaderKeywords:
1213
m_LightmapFlags: 4
1314
m_EnableInstancingVariants: 0

‎unityproj_spatialflowvis/Assets/Buildings/Materials/accent_1.mat‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: accent_1
10-
m_Shader: {fileID: 4800000, guid: a956924bd6a8ae44ca741bc69e575fe3, type: 3}
11+
m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
1112
m_ShaderKeywords:
1213
m_LightmapFlags: 4
1314
m_EnableInstancingVariants: 0

‎unityproj_spatialflowvis/Assets/Buildings/Materials/aqua.mat‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: aqua
10-
m_Shader: {fileID: 4800000, guid: a956924bd6a8ae44ca741bc69e575fe3, type: 3}
11+
m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
1112
m_ShaderKeywords:
1213
m_LightmapFlags: 4
1314
m_EnableInstancingVariants: 0

‎unityproj_spatialflowvis/Assets/Buildings/Materials/black.mat‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: black
10-
m_Shader: {fileID: 4800000, guid: a956924bd6a8ae44ca741bc69e575fe3, type: 3}
11+
m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
1112
m_ShaderKeywords:
1213
m_LightmapFlags: 4
1314
m_EnableInstancingVariants: 0

‎unityproj_spatialflowvis/Assets/Buildings/Materials/blue.mat‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: blue
10-
m_Shader: {fileID: 4800000, guid: a956924bd6a8ae44ca741bc69e575fe3, type: 3}
11+
m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
1112
m_ShaderKeywords:
1213
m_LightmapFlags: 4
1314
m_EnableInstancingVariants: 0

‎unityproj_spatialflowvis/Assets/Buildings/Materials/blue_2.mat‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: blue_2
10-
m_Shader: {fileID: 4800000, guid: a956924bd6a8ae44ca741bc69e575fe3, type: 3}
11+
m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
1112
m_ShaderKeywords:
1213
m_LightmapFlags: 4
1314
m_EnableInstancingVariants: 0

‎unityproj_spatialflowvis/Assets/Buildings/Materials/blue_3.mat‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: blue_3
10-
m_Shader: {fileID: 4800000, guid: a956924bd6a8ae44ca741bc69e575fe3, type: 3}
11+
m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
1112
m_ShaderKeywords:
1213
m_LightmapFlags: 4
1314
m_EnableInstancingVariants: 0

‎unityproj_spatialflowvis/Assets/Buildings/Materials/blue_5.mat‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: blue_5
10-
m_Shader: {fileID: 4800000, guid: a956924bd6a8ae44ca741bc69e575fe3, type: 3}
11+
m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
1112
m_ShaderKeywords:
1213
m_LightmapFlags: 4
1314
m_EnableInstancingVariants: 0

‎unityproj_spatialflowvis/Assets/Buildings/Materials/blue_6.mat‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: blue_6
10-
m_Shader: {fileID: 4800000, guid: a956924bd6a8ae44ca741bc69e575fe3, type: 3}
11+
m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
1112
m_ShaderKeywords:
1213
m_LightmapFlags: 4
1314
m_EnableInstancingVariants: 0

‎unityproj_spatialflowvis/Assets/Buildings/Materials/bright_green.mat‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: bright_green
10-
m_Shader: {fileID: 4800000, guid: a956924bd6a8ae44ca741bc69e575fe3, type: 3}
11+
m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
1112
m_ShaderKeywords:
1213
m_LightmapFlags: 4
1314
m_EnableInstancingVariants: 0

0 commit comments

Comments
 (0)