Skip to content

Commit 57918e5

Browse files
Merge pull request #547 from Unity-Technologies/backwards-compatibility
Backwards Compatibility
2 parents ce79cd6 + 57a3975 commit 57918e5

26 files changed

Lines changed: 4180 additions & 4412 deletions

Fonts/Roboto/Roboto-Medium SDF Alternate Menu Text.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabParentObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: Roboto-Medium SDF Alternate Menu Text
1010
m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}

Manipulators/ScaleManipulator.prefab

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -429,8 +429,8 @@ MonoBehaviour:
429429
m_Enabled: 1
430430
m_EditorHideFlags: 0
431431
m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3}
432-
m_Name:
433-
m_EditorClassIdentifier:
432+
m_Name:
433+
m_EditorClassIdentifier:
434434
m_SelectionFlags: 3
435435
m_OrientDragPlaneToRay: 1
436436
m_Constraints: 0
@@ -443,8 +443,8 @@ MonoBehaviour:
443443
m_Enabled: 1
444444
m_EditorHideFlags: 0
445445
m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3}
446-
m_Name:
447-
m_EditorClassIdentifier:
446+
m_Name:
447+
m_EditorClassIdentifier:
448448
m_SelectionFlags: 3
449449
m_OrientDragPlaneToRay: 1
450450
m_Constraints: 0
@@ -457,8 +457,8 @@ MonoBehaviour:
457457
m_Enabled: 1
458458
m_EditorHideFlags: 0
459459
m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3}
460-
m_Name:
461-
m_EditorClassIdentifier:
460+
m_Name:
461+
m_EditorClassIdentifier:
462462
m_SelectionFlags: 3
463463
m_OrientDragPlaneToRay: 1
464464
m_Constraints: 0
@@ -471,8 +471,8 @@ MonoBehaviour:
471471
m_Enabled: 1
472472
m_EditorHideFlags: 0
473473
m_Script: {fileID: 11500000, guid: 410244f902f0bbc47a023d4a93ffeea9, type: 3}
474-
m_Name:
475-
m_EditorClassIdentifier:
474+
m_Name:
475+
m_EditorClassIdentifier:
476476
m_SelectionFlags: 3
477477
m_OrientDragPlaneToRay: 1
478478
m_Constraints: 0
@@ -485,8 +485,8 @@ MonoBehaviour:
485485
m_Enabled: 1
486486
m_EditorHideFlags: 0
487487
m_Script: {fileID: 11500000, guid: 4dbf941c00473034b89a9acd39176c7f, type: 3}
488-
m_Name:
489-
m_EditorClassIdentifier:
488+
m_Name:
489+
m_EditorClassIdentifier:
490490
m_HandleTip: {fileID: 23000013012300180}
491491
m_AllHandles:
492492
- {fileID: 114000010053947466}

Menus/RadialMenu/Materials/RadialMenuFrame.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabParentObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: RadialMenuFrame
1010
m_Shader: {fileID: 4800000, guid: b10f0b677131a2945855a113a27b7093, type: 3}

Menus/RadialMenu/Materials/RadialMenuFrameOuterBorder.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabParentObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: RadialMenuFrameOuterBorder
1010
m_Shader: {fileID: 4800000, guid: b10f0b677131a2945855a113a27b7093, type: 3}

Menus/RadialMenu/Materials/RadialMenuIcon.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabParentObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: RadialMenuIcon
1010
m_Shader: {fileID: 4800000, guid: bb5c2bef6f6cd59459628622758d17ff, type: 3}

Menus/RadialMenu/Materials/RadialMenuSlotInset.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabParentObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: RadialMenuSlotInset
1010
m_Shader: {fileID: 4800000, guid: c8cf0b95851289d40aecbbb604f214fd, type: 3}

Menus/RadialMenu/Materials/RadialMenuSlotsMask.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabParentObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: RadialMenuSlotsMask
1010
m_Shader: {fileID: 4800000, guid: da29182e4499c6740bf4e5dc3198313a, type: 3}

Menus/SpatialUI/Materials/SpatialUIRobotoRegularOverlaySDF.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
7-
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabParentObject: {fileID: 0}
88
m_PrefabInternal: {fileID: 0}
99
m_Name: SpatialUIRobotoRegularOverlaySDF
1010
m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}

0 commit comments

Comments
 (0)