Skip to content
This repository has been archived by the owner on Aug 11, 2024. It is now read-only.

Update XRTK logo #219

Merged
merged 1 commit into from
Jun 21, 2019
+34 −112
Merged

Update XRTK logo #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions XRTK-Core/Packages/com.xrtk.core/Inspectors/Utilities/MixedRealityInspectorUtility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public static Texture2D DarkThemeLogo
{
if (darkThemeLogo == null)
{
darkThemeLogo = (Texture2D)AssetDatabase.LoadAssetAtPath($"{MixedRealityEditorSettings.MixedRealityToolkit_RelativeFolderPath}/StandardAssets/Textures/XRTK_Logo_Black.png", typeof(Texture2D));
darkThemeLogo = (Texture2D)AssetDatabase.LoadAssetAtPath($"{MixedRealityEditorSettings.MixedRealityToolkit_RelativeFolderPath}/StandardAssets/Textures/XRTK_Logo.png", typeof(Texture2D));
}

return darkThemeLogo;
Expand All @@ -144,7 +144,7 @@ public static Texture2D LightThemeLogo
{
if (lightThemeLogo == null)
{
lightThemeLogo = (Texture2D)AssetDatabase.LoadAssetAtPath($"{MixedRealityEditorSettings.MixedRealityToolkit_RelativeFolderPath}/StandardAssets/Textures/XRTK_Logo_White.png", typeof(Texture2D));
lightThemeLogo = (Texture2D)AssetDatabase.LoadAssetAtPath($"{MixedRealityEditorSettings.MixedRealityToolkit_RelativeFolderPath}/StandardAssets/Textures/XRTK_Logo.png", typeof(Texture2D));
}

return lightThemeLogo;
Expand Down
Binary file added XRTK-Core/Packages/com.xrtk.core/StandardAssets/Textures/XRTK_Logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 32 additions & 4 deletions ...dAssets/Textures/XRTK_Logo_Black.png.meta → ...tandardAssets/Textures/XRTK_Logo.png.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed XRTK-Core/Packages/com.xrtk.core/StandardAssets/Textures/XRTK_Logo_Black.png
View file
Open in desktop
Binary file not shown.
Binary file removed XRTK-Core/Packages/com.xrtk.core/StandardAssets/Textures/XRTK_Logo_White.png
View file
Open in desktop
Binary file not shown.
106 changes: 0 additions & 106 deletions XRTK-Core/Packages/com.xrtk.core/StandardAssets/Textures/XRTK_Logo_White.png.meta
View file
Open in desktop

This file was deleted.