Skip to content

Commit 2a06e5b

Browse files
author
David Kline
authored
Merge pull request #3411 from keveleigh/sync-interactable-guids
Sync interactable guids
2 parents f0eaab3 + d78ef1e commit 2a06e5b

File tree

6 files changed

+30
-30
lines changed

6 files changed

+30
-30
lines changed

‎Assets/MixedRealityToolkit.Examples/Demos/UX/Interactables/Scenes/InteractablesGallery.unity‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -569,98 +569,98 @@ Prefab:
569569
m_Modification:
570570
m_TransformParent: {fileID: 561651893}
571571
m_Modifications:
572-
- target: {fileID: 114809329666163580, guid: 40da8a1b3b26ba743b892d890b95a9f9,
572+
- target: {fileID: 114809329666163580, guid: 80cec532ae7b6c1429d0f5494e7dbd8c,
573573
type: 2}
574574
propertyPath: Profiles.Array.data[0].Themes.Array.size
575575
value: 1
576576
objectReference: {fileID: 0}
577-
- target: {fileID: 114809329666163580, guid: 40da8a1b3b26ba743b892d890b95a9f9,
577+
- target: {fileID: 114809329666163580, guid: 80cec532ae7b6c1429d0f5494e7dbd8c,
578578
type: 2}
579579
propertyPath: Profiles.Array.data[1].Themes.Array.size
580580
value: 1
581581
objectReference: {fileID: 0}
582-
- target: {fileID: 114809329666163580, guid: 40da8a1b3b26ba743b892d890b95a9f9,
582+
- target: {fileID: 114809329666163580, guid: 80cec532ae7b6c1429d0f5494e7dbd8c,
583583
type: 2}
584584
propertyPath: Profiles.Array.data[2].Themes.Array.size
585585
value: 1
586586
objectReference: {fileID: 0}
587-
- target: {fileID: 4249060311757736, guid: 40da8a1b3b26ba743b892d890b95a9f9, type: 2}
587+
- target: {fileID: 4249060311757736, guid: 80cec532ae7b6c1429d0f5494e7dbd8c, type: 2}
588588
propertyPath: m_LocalPosition.x
589589
value: -0.57
590590
objectReference: {fileID: 0}
591-
- target: {fileID: 4249060311757736, guid: 40da8a1b3b26ba743b892d890b95a9f9, type: 2}
591+
- target: {fileID: 4249060311757736, guid: 80cec532ae7b6c1429d0f5494e7dbd8c, type: 2}
592592
propertyPath: m_LocalPosition.y
593593
value: 0.07599999
594594
objectReference: {fileID: 0}
595-
- target: {fileID: 4249060311757736, guid: 40da8a1b3b26ba743b892d890b95a9f9, type: 2}
595+
- target: {fileID: 4249060311757736, guid: 80cec532ae7b6c1429d0f5494e7dbd8c, type: 2}
596596
propertyPath: m_LocalPosition.z
597597
value: 0.48800004
598598
objectReference: {fileID: 0}
599-
- target: {fileID: 4249060311757736, guid: 40da8a1b3b26ba743b892d890b95a9f9, type: 2}
599+
- target: {fileID: 4249060311757736, guid: 80cec532ae7b6c1429d0f5494e7dbd8c, type: 2}
600600
propertyPath: m_LocalRotation.x
601601
value: -0
602602
objectReference: {fileID: 0}
603-
- target: {fileID: 4249060311757736, guid: 40da8a1b3b26ba743b892d890b95a9f9, type: 2}
603+
- target: {fileID: 4249060311757736, guid: 80cec532ae7b6c1429d0f5494e7dbd8c, type: 2}
604604
propertyPath: m_LocalRotation.y
605605
value: -0
606606
objectReference: {fileID: 0}
607-
- target: {fileID: 4249060311757736, guid: 40da8a1b3b26ba743b892d890b95a9f9, type: 2}
607+
- target: {fileID: 4249060311757736, guid: 80cec532ae7b6c1429d0f5494e7dbd8c, type: 2}
608608
propertyPath: m_LocalRotation.z
609609
value: -0
610610
objectReference: {fileID: 0}
611-
- target: {fileID: 4249060311757736, guid: 40da8a1b3b26ba743b892d890b95a9f9, type: 2}
611+
- target: {fileID: 4249060311757736, guid: 80cec532ae7b6c1429d0f5494e7dbd8c, type: 2}
612612
propertyPath: m_LocalRotation.w
613613
value: 1
614614
objectReference: {fileID: 0}
615-
- target: {fileID: 4249060311757736, guid: 40da8a1b3b26ba743b892d890b95a9f9, type: 2}
615+
- target: {fileID: 4249060311757736, guid: 80cec532ae7b6c1429d0f5494e7dbd8c, type: 2}
616616
propertyPath: m_RootOrder
617617
value: 5
618618
objectReference: {fileID: 0}
619-
- target: {fileID: 114575116837749478, guid: 40da8a1b3b26ba743b892d890b95a9f9,
619+
- target: {fileID: 114575116837749478, guid: 80cec532ae7b6c1429d0f5494e7dbd8c,
620620
type: 2}
621621
propertyPath: m_havePropertiesChanged
622622
value: 1
623623
objectReference: {fileID: 0}
624-
- target: {fileID: 114575116837749478, guid: 40da8a1b3b26ba743b892d890b95a9f9,
624+
- target: {fileID: 114575116837749478, guid: 80cec532ae7b6c1429d0f5494e7dbd8c,
625625
type: 2}
626626
propertyPath: m_isInputParsingRequired
627627
value: 1
628628
objectReference: {fileID: 0}
629-
- target: {fileID: 33206966778645120, guid: 40da8a1b3b26ba743b892d890b95a9f9,
629+
- target: {fileID: 33206966778645120, guid: 80cec532ae7b6c1429d0f5494e7dbd8c,
630630
type: 2}
631631
propertyPath: m_Mesh
632632
value:
633633
objectReference: {fileID: 0}
634-
- target: {fileID: 114809329666163580, guid: 40da8a1b3b26ba743b892d890b95a9f9,
634+
- target: {fileID: 114809329666163580, guid: 80cec532ae7b6c1429d0f5494e7dbd8c,
635635
type: 2}
636636
propertyPath: Dimensions
637637
value: 1
638638
objectReference: {fileID: 0}
639-
- target: {fileID: 114809329666163580, guid: 40da8a1b3b26ba743b892d890b95a9f9,
639+
- target: {fileID: 114809329666163580, guid: 80cec532ae7b6c1429d0f5494e7dbd8c,
640640
type: 2}
641641
propertyPath: Profiles.Array.data[0].Themes.Array.data[1]
642642
value:
643643
objectReference: {fileID: 11400000, guid: 29b20ecfcc16eef4dad8989c360f2988,
644644
type: 2}
645-
- target: {fileID: 114809329666163580, guid: 40da8a1b3b26ba743b892d890b95a9f9,
645+
- target: {fileID: 114809329666163580, guid: 80cec532ae7b6c1429d0f5494e7dbd8c,
646646
type: 2}
647647
propertyPath: Profiles.Array.data[1].Themes.Array.data[1]
648648
value:
649649
objectReference: {fileID: 11400000, guid: cbde7890146c3024d928b7afc2e16065,
650650
type: 2}
651-
- target: {fileID: 114809329666163580, guid: 40da8a1b3b26ba743b892d890b95a9f9,
651+
- target: {fileID: 114809329666163580, guid: 80cec532ae7b6c1429d0f5494e7dbd8c,
652652
type: 2}
653653
propertyPath: Profiles.Array.data[2].Themes.Array.data[1]
654654
value:
655655
objectReference: {fileID: 11400000, guid: 0c4c73f326f602744bdcfff481fd6f20,
656656
type: 2}
657-
- target: {fileID: 114809329666163580, guid: 40da8a1b3b26ba743b892d890b95a9f9,
657+
- target: {fileID: 114809329666163580, guid: 80cec532ae7b6c1429d0f5494e7dbd8c,
658658
type: 2}
659659
propertyPath: InputActionId
660660
value: 0
661661
objectReference: {fileID: 0}
662662
m_RemovedComponents: []
663-
m_SourcePrefab: {fileID: 100100000, guid: 40da8a1b3b26ba743b892d890b95a9f9, type: 2}
663+
m_SourcePrefab: {fileID: 100100000, guid: 80cec532ae7b6c1429d0f5494e7dbd8c, type: 2}
664664
m_IsPrefabAsset: 0
665665
--- !u!1 &561651892
666666
GameObject:
@@ -1864,7 +1864,7 @@ Transform:
18641864
m_PrefabInternal: {fileID: 905760910}
18651865
--- !u!4 &1489297081 stripped
18661866
Transform:
1867-
m_CorrespondingSourceObject: {fileID: 4249060311757736, guid: 40da8a1b3b26ba743b892d890b95a9f9,
1867+
m_CorrespondingSourceObject: {fileID: 4249060311757736, guid: 80cec532ae7b6c1429d0f5494e7dbd8c,
18681868
type: 2}
18691869
m_PrefabInternal: {fileID: 548018554}
18701870
--- !u!1 &1510982888

‎Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonContent.mat.meta‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonPlate.mat.meta‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/HolographicButton.prefab‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ MeshRenderer:
259259
m_RenderingLayerMask: 4294967295
260260
m_RendererPriority: 0
261261
m_Materials:
262-
- {fileID: 2100000, guid: df4abdb025f6c11489a7f77f9fba8659, type: 2}
262+
- {fileID: 2100000, guid: 19bfc37fa7629b842a220853f7f60782, type: 2}
263263
m_StaticBatchInfo:
264264
firstSubMesh: 0
265265
subMeshCount: 0
@@ -336,7 +336,7 @@ MeshRenderer:
336336
m_RenderingLayerMask: 4294967295
337337
m_RendererPriority: 0
338338
m_Materials:
339-
- {fileID: 2100000, guid: 1c018e76b2657e041976bfa8486880aa, type: 2}
339+
- {fileID: 2100000, guid: 1ad68daec9ac6374cb32214e55dc158e, type: 2}
340340
m_StaticBatchInfo:
341341
firstSubMesh: 0
342342
subMeshCount: 0
@@ -413,7 +413,7 @@ MeshRenderer:
413413
m_RenderingLayerMask: 4294967295
414414
m_RendererPriority: 0
415415
m_Materials:
416-
- {fileID: 2100000, guid: df4abdb025f6c11489a7f77f9fba8659, type: 2}
416+
- {fileID: 2100000, guid: 19bfc37fa7629b842a220853f7f60782, type: 2}
417417
m_StaticBatchInfo:
418418
firstSubMesh: 0
419419
subMeshCount: 0

‎Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/HolographicButton.prefab.meta‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Prefabs/HolographicButtonToggle.prefab‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ MeshRenderer:
230230
m_RenderingLayerMask: 4294967295
231231
m_RendererPriority: 0
232232
m_Materials:
233-
- {fileID: 2100000, guid: df4abdb025f6c11489a7f77f9fba8659, type: 2}
233+
- {fileID: 2100000, guid: 19bfc37fa7629b842a220853f7f60782, type: 2}
234234
m_StaticBatchInfo:
235235
firstSubMesh: 0
236236
subMeshCount: 0
@@ -339,7 +339,7 @@ MeshRenderer:
339339
m_RenderingLayerMask: 4294967295
340340
m_RendererPriority: 0
341341
m_Materials:
342-
- {fileID: 2100000, guid: df4abdb025f6c11489a7f77f9fba8659, type: 2}
342+
- {fileID: 2100000, guid: 19bfc37fa7629b842a220853f7f60782, type: 2}
343343
m_StaticBatchInfo:
344344
firstSubMesh: 0
345345
subMeshCount: 0
@@ -416,7 +416,7 @@ MeshRenderer:
416416
m_RenderingLayerMask: 4294967295
417417
m_RendererPriority: 0
418418
m_Materials:
419-
- {fileID: 2100000, guid: 1c018e76b2657e041976bfa8486880aa, type: 2}
419+
- {fileID: 2100000, guid: 1ad68daec9ac6374cb32214e55dc158e, type: 2}
420420
m_StaticBatchInfo:
421421
firstSubMesh: 0
422422
subMeshCount: 0

0 commit comments

Comments
 (0)